From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2013 21:33:16 +0000 (-0700)
Subject: Merge branch 'tr/log-full-diff-keep-true-parents'
X-Git-Tag: v1.8.5-rc0~167
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ab4a6dfb414230bb3e13ba65a1aa2606c6102f3;p=git-core%2Fgit.git

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
---

4ab4a6dfb414230bb3e13ba65a1aa2606c6102f3