summaryrefslogtreecommitdiff
path: root/Documentation/git-symbolic-ref.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-24 12:40:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-24 12:40:02 -0700
commit140011d8f2d17b050942e8a4bb33ecbd6827df2e (patch)
tree3aca098774bb7364b3b861a5c5e67990f660e9d6 /Documentation/git-symbolic-ref.txt
parentMerge branch 'dj/fetch-all-tags' into maint (diff)
parentblame: allow "blame file" in the middle of a conflicted merge (diff)
downloadtgif-140011d8f2d17b050942e8a4bb33ecbd6827df2e.tar.xz
Merge branch 'jc/maint-blame-no-such-path' into maint
Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. This incidentally fixes an unrelated problem on a case insensitive filesystem, where "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" did not say "No such file MAKEFILE in HEAD" but pretended as if "MAKEFILE" was a newly added file. * jc/maint-blame-no-such-path: blame: allow "blame file" in the middle of a conflicted merge blame $path: avoid getting fooled by case insensitive filesystems
Diffstat (limited to 'Documentation/git-symbolic-ref.txt')
0 files changed, 0 insertions, 0 deletions