Merge branch 'tr/log-full-diff-keep-true-parents' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:05 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:05 +0000 (11:59 -0700)
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

1  2 
combine-diff.c
commit.c
commit.h
diff --cc combine-diff.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge