| commit | 31b83f361bd962e9c5f96bf7714051d77f592af2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Sep 2016 23:09:18 +0000 (26 16:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Sep 2016 23:09:18 +0000 (26 16:09 -0700) | ||
| tree | 457f3839db3bba30e984dfc9d973fa0e7c981c8e | treesnapshot (tar.gz zip) |
| parent | 8969feac7ee119dc3cdae0e2d8c65516aa8f4045 | commitdiff |
| parent | b829b9439adc12fa4fb33338694e7f1ad40254c1 | commitdiff |
Merge branch 'nd/checkout-disambiguation'
"git checkout <word>" does not follow the usual disambiguation
rules when the <word> can be both a rev and a path, to allow
checking out a branch 'foo' in a project that happens to have a
file 'foo' in the working tree without having to disambiguate.
This was poorly documented and the check was incorrect when the
command was run from a subdirectory.
* nd/checkout-disambiguation:
checkout: fix ambiguity check in subdir
checkout.txt: document a common case that ignores ambiguation rules
checkout: add some spaces between code and comment
"git checkout <word>" does not follow the usual disambiguation
rules when the <word> can be both a rev and a path, to allow
checking out a branch 'foo' in a project that happens to have a
file 'foo' in the working tree without having to disambiguate.
This was poorly documented and the check was incorrect when the
command was run from a subdirectory.
* nd/checkout-disambiguation:
checkout: fix ambiguity check in subdir
checkout.txt: document a common case that ignores ambiguation rules
checkout: add some spaces between code and comment
| builtin/checkout.c | diff1 | diff2 | blobhistory |