From: Junio C Hamano Date: Thu, 29 Sep 2016 23:49:43 +0000 (-0700) Subject: Merge branch 'nd/checkout-disambiguation' into maint X-Git-Tag: v2.10.1~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d336b675680c7d4adc9f7190b7974b2ef10c0af4?hp=--cc Merge branch 'nd/checkout-disambiguation' into maint "git checkout " does not follow the usual disambiguation rules when the 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 --- d336b675680c7d4adc9f7190b7974b2ef10c0af4