| commit | f4724e9c8a8b0555afa4065887cd9f8d5a664588 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Aug 2008 00:09:25 +0000 (17 17:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Aug 2008 00:09:25 +0000 (17 17:09 -0700) | ||
| tree | 00a62ce54d01482a059f1630fbc06763e30251cf | treesnapshot (tar.gz zip) |
| parent | aa56528b42a616e4d3adafefb947b6c694a239da | commitdiff |
| parent | f34a9416ab9efa13a53a31cabd9061d583aaba7e | commitdiff |
Merge branch 'tr/filter-branch' into next
* tr/filter-branch:
filter-branch: use --simplify-merges
filter-branch: fix ref rewriting with --subdirectory-filter
filter-branch: Extend test to show rewriting bug
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
Conflicts:
Documentation/rev-list-options.txt
* tr/filter-branch:
filter-branch: use --simplify-merges
filter-branch: fix ref rewriting with --subdirectory-filter
filter-branch: Extend test to show rewriting bug
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 | blobhistory |