diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
| commit | 00b718e02d97c956cade8c1b4cbe29a9d3e92765 (patch) | |
| tree | 74f04a8d21f6903b066b77920bb59684ce7a5632 /git-gui/lib/diff.tcl | |
| parent | Documentation: rev-list-options: Rewrite simplification descriptions for clarity (diff) | |
| parent | Topo-sort before --simplify-merges (diff) | |
| download | git-00b718e02d97c956cade8c1b4cbe29a9d3e92765.tar.gz git-00b718e02d97c956cade8c1b4cbe29a9d3e92765.zip | |
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
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions