| commit | 6930cd10de930b09639e1dad7ae8d74f9128e404 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Sep 2013 18:59:05 +0000 (18 11:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Sep 2013 18:59:05 +0000 (18 11:59 -0700) | ||
| tree | d3cee943976b69449b939a6aa359c9c4dc8c0f34 | treesnapshot (tar.gz zip) |
| parent | 1e93c28f53e19945f059fd709729d724f8c06446 | commitdiff |
| parent | 838f9a15667cfefa9e645c26627ce81ce7599915 | commitdiff |
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
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
| combine-diff.c | diff1 | diff2 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |
| commit.h | diff1 | diff2 | blobhistory |