projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76c57fe fa74180)
Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2020 22:34:58 +0000 (14:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2020 22:34:58 +0000 (14:34 -0800)
commitd0e70cd32e95df3be2250536f9089c858a298874
treee2e6d3dd6421d508ce1c0813c1909e30c2f216aatree | snapshot
parent76c57fedfa8a15bd341c0059bff164a049fe1d5ccommit | diff
parentfa74180d08e0a82bdae0c127a009b055c603b11acommit | diff
Merge branch 'am/checkout-file-and-ref-ref-ambiguity'

"git checkout X" did not correctly fail when X is not a local
branch but could name more than one remote-tracking branches
(i.e. to be dwimmed as the starting point to create a corresponding
local branch), which has been corrected.

* am/checkout-file-and-ref-ref-ambiguity:
  checkout: don't revert file on ambiguous tracking branches
  parse_branchname_arg(): extract part as new function
builtin/checkout.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.