From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 23:09:18 +0000 (-0700)
Subject: Merge branch 'nd/checkout-disambiguation'
X-Git-Tag: v2.11.0-rc0~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31b83f361bd962e9c5f96bf7714051d77f592af2;p=git

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
---

31b83f361bd962e9c5f96bf7714051d77f592af2