diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:52:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:52:32 -0700 |
| commit | 992311cf860347df159081873fba099a94d463f4 (patch) | |
| tree | 38b7b29c984070d76a0aa6900d71135e3023bbd5 /object.h | |
| parent | 83379df0251243b5e1f328598bfdd39327766df3 (diff) | |
| parent | 9aeaab6811dce596b4f6141d76f5300359bfd009 (diff) | |
| download | git-992311cf860347df159081873fba099a94d463f4.tar.gz | |
Merge branch 'jc/maint-blame-no-such-path'
"git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.
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.
* 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 'object.h')
0 files changed, 0 insertions, 0 deletions