From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2013 18:59:05 +0000 (-0700)
Subject: Merge branch 'tr/log-full-diff-keep-true-parents' into maint
X-Git-Tag: v1.8.4.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6930cd10de930b09639e1dad7ae8d74f9128e404;p=thirdparty%2Fgit.git

Merge branch 'tr/log-full-diff-keep-true-parents' into maint

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.

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

6930cd10de930b09639e1dad7ae8d74f9128e404