On Tue, Sep 20, 2016 at 6:30 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > * nd/checkout-disambiguation (2016-09-09) 4 commits > - fixup! checkout.txt: document a common case that ignores ambiguation rules > - 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. > > Waiting for an Ack for fixup! Oops, I didn't know (I have about 300 unread git mails in my inbox), Ack. -- Duy