diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-13 05:51:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-13 05:51:19 (GMT) |
| commit | b2b80c107f6db4c3297af59fd2fb40ada5899778 (patch) | |
| tree | bf47fd6d9aa703fbcf46aba8e38c2069cd8c0324 /xdiff/xdiffi.h | |
| parent | 72b6157aa847615a778ac9950e87dde109afa50c (diff) | |
| parent | 7bc2508bfe0f7e8c0371a68f57ac5b7d4fe7e1f0 (diff) | |
| download | git-b2b80c107f6db4c3297af59fd2fb40ada5899778.zip git-b2b80c107f6db4c3297af59fd2fb40ada5899778.tar.gz git-b2b80c107f6db4c3297af59fd2fb40ada5899778.tar.bz2 | |
Merge branch 'lt/decorate'
* lt/decorate:
rev-list documentation: clarify the two parts of history simplification
Document "git log --simplify-by-decoration"
Document "git log --source"
revision traversal: '--simplify-by-decoration'
Make '--decorate' set an explicit 'show_decorations' flag
revision: make tree comparison functions take commits rather than trees
Add a 'source' decorator for commits
Conflicts:
Documentation/rev-list-options.txt
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions