aboutsummaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 15:54:06 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-02 15:54:06 -0700
commit1197c2298bd47c7046b57d92df2fd055051fbe99 (patch)
tree0bd075b22384b0c68bf340097e9a2f0d57740bae /config.mak.uname
parent41aaccdcf9170e744e423f2b1f889ada6604ae38 (diff)
parentf3f8af0e54a31ffed242dc36482f82393f596ee5 (diff)
downloadgit-1197c2298bd47c7046b57d92df2fd055051fbe99.tar.gz
git-1197c2298bd47c7046b57d92df2fd055051fbe99.tar.xz
Merge branch 'vv/help-unknown-ref'
Detect "git merge foo" that might have meant "git merge origin/foo" and give an error message that is more specific than "foo is not something we can merge". * vv/help-unknown-ref: merge: use help_unknown_ref() help: add help_unknown_ref()
Diffstat (limited to 'config.mak.uname')
0 files changed, 0 insertions, 0 deletions