summaryrefslogtreecommitdiff
path: root/builtin/write-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:34 -0800
commit8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a (patch)
tree35158bce87365f3c6e38faa7c0df54337b3fa637 /builtin/write-tree.c
parentMerge branch 'ab/push-dwim-dst' (diff)
parentcheckout: disambiguate dwim tracking branches and local files (diff)
downloadtgif-8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a.tar.xz
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
Diffstat (limited to 'builtin/write-tree.c')
0 files changed, 0 insertions, 0 deletions