diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:34:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:34:58 -0800 |
| commit | d0e70cd32e95df3be2250536f9089c858a298874 (patch) | |
| tree | e2e6d3dd6421d508ce1c0813c1909e30c2f216aa /dir-iterator.c | |
| parent | Merge branch 'js/add-p-leftover-bits' (diff) | |
| parent | checkout: don't revert file on ambiguous tracking branches (diff) | |
| download | tgif-d0e70cd32e95df3be2250536f9089c858a298874.tar.xz | |
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
Diffstat (limited to 'dir-iterator.c')
0 files changed, 0 insertions, 0 deletions