Merge branch 'tr/log-full-diff-keep-true-parents'
commit4ab4a6dfb414230bb3e13ba65a1aa2606c6102f3
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:33:16 +0000 (9 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:33:16 +0000 (9 14:33 -0700)
treeb82e5312a7b54dcd85139b243ff688b7da737ab4
parent24703ead4b9391cbe71ce9978cbffdd6c3ecbaec
parent838f9a15667cfefa9e645c26627ce81ce7599915
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
combine-diff.c
commit.c
commit.h