| commit | d0e70cd32e95df3be2250536f9089c858a298874 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Feb 2020 22:34:58 +0000 (5 14:34 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Feb 2020 22:34:58 +0000 (5 14:34 -0800) | ||
| tree | e2e6d3dd6421d508ce1c0813c1909e30c2f216aa | treesnapshot (tar.gz zip) |
| parent | 76c57fedfa8a15bd341c0059bff164a049fe1d5c | commitdiff |
| parent | fa74180d08e0a82bdae0c127a009b055c603b11a | commitdiff |
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
"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 | blobhistory |