![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Aug 2008 04:40:05 +0000 (21:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Aug 2008 04:40:05 +0000 (21:40 -0700) | ||
| commit | 00b718e02d97c956cade8c1b4cbe29a9d3e92765 | |
| tree | 74f04a8d21f6903b066b77920bb59684ce7a5632 | tree | snapshot |
| parent | 70d9895ebcb8d401b569d28f049ad37fcb7b5ade | commit | diff |
| parent | 65347030590bcc251a9ff2ed96487a0f1b9e9fa8 | commit | diff |
Merge branch 'jc/post-simplify' into tr/rev-list-docs
* jc/post-simplify:
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
Conflicts:
Documentation/rev-list-options.txt
* jc/post-simplify:
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
Conflicts:
Documentation/rev-list-options.txt
| Documentation/rev-list-options.txt | diff1 | | diff2 | | blob | history |