diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:54:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:54:06 -0700 |
| commit | 1197c2298bd47c7046b57d92df2fd055051fbe99 (patch) | |
| tree | 0bd075b22384b0c68bf340097e9a2f0d57740bae /.gitattributes | |
| parent | Merge branch 'nd/clone-local-with-colon' (diff) | |
| parent | merge: use help_unknown_ref() (diff) | |
| download | tgif-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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions