From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Jan 2019 21:33:34 +0000 (-0800)
Subject: Merge branch 'nd/checkout-dwim-fix'
X-Git-Tag: v2.21.0-rc0~128
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a

Merge branch 'nd/checkout-dwim-fix'

"git checkout frotz" (without any double-dash) avoids ambiguity by
making sure 'frotz' cannot be interpreted as a revision and as a
path at the same time.  This safety has been updated to check also
a unique remote-tracking branch 'frotz' in a remote, when dwimming
to create a local branch 'frotz' out of a remote-tracking branch
'frotz' from a remote.

* nd/checkout-dwim-fix:
checkout: disambiguate dwim tracking branches and local files
---

8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a