diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:33:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:33:16 -0700 |
commit | 4ab4a6dfb414230bb3e13ba65a1aa2606c6102f3 (patch) | |
tree | b82e5312a7b54dcd85139b243ff688b7da737ab4 /rerere.c | |
parent | Merge branch 'jk/cat-file-batch-optim' (diff) | |
parent | log: use true parents for diff when walking reflogs (diff) | |
download | tgif-4ab4a6dfb414230bb3e13ba65a1aa2606c6102f3.tar.xz |
Merge branch 'tr/log-full-diff-keep-true-parents'
Output from "git log --full-diff -- <pathspec>" looked strange,
because comparison was done with the previous ancestor that touched
the specified <pathspec>, causing the patches for paths outside the
pathspec to show more than the single commit has changed.
Tweak "git reflog -p" for the same reason using the same mechanism.
* tr/log-full-diff-keep-true-parents:
log: use true parents for diff when walking reflogs
log: use true parents for diff even when rewriting
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions