summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-09-07 18:19:41 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 08:44:41 -0700
commitb829b9439adc12fa4fb33338694e7f1ad40254c1 (patch)
treeb7718c1f6996471f382dd5d8b02c95ab303e37bb /Documentation/git-merge-index.txt
parentcheckout.txt: document a common case that ignores ambiguation rules (diff)
downloadtgif-b829b9439adc12fa4fb33338694e7f1ad40254c1.tar.xz
checkout: fix ambiguity check in subdir
The two functions in parse_branchname_arg(), verify_non_filename and check_filename, need correct prefix in order to reconstruct the paths and check for their existence. With NULL prefix, they just check paths at top dir instead. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions