summaryrefslogtreecommitdiff
path: root/blame.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:55 -0700
commit72c11b7e62c02d18a51f0bbaa2154ecebf8c74f0 (patch)
tree3ae354187efd31883707de12020f700e2d128c9e /blame.h
parentMerge branch 'jk/merge-subtree-heuristics' (diff)
parentremote: make refspec follow the same disambiguation rule as local refs (diff)
downloadtgif-72c11b7e62c02d18a51f0bbaa2154ecebf8c74f0.tar.xz
Merge branch 'jt/refspec-dwim-precedence-fix'
"git fetch $there refs/heads/s" ought to fetch the tip of the branch 's', but when "refs/heads/refs/heads/s", i.e. a branch whose name is "refs/heads/s" exists at the same time, fetched that one instead by mistake. This has been corrected to honor the usual disambiguation rules for abbreviated refnames. * jt/refspec-dwim-precedence-fix: remote: make refspec follow the same disambiguation rule as local refs
Diffstat (limited to 'blame.h')
0 files changed, 0 insertions, 0 deletions