| commit | 1197c2298bd47c7046b57d92df2fd055051fbe99 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:54:06 +0000 (2 15:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:54:06 +0000 (2 15:54 -0700) | ||
| tree | 0bd075b22384b0c68bf340097e9a2f0d57740bae | treesnapshot (tar.gz zip) |
| parent | 41aaccdcf9170e744e423f2b1f889ada6604ae38 | commitdiff |
| parent | f3f8af0e54a31ffed242dc36482f82393f596ee5 | commitdiff |
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()
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()