Merge branch 'tr/filter-branch'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:47:13 +0000 (17:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:47:13 +0000 (17:47 -0700)
* tr/filter-branch:
revision --simplify-merges: make it a no-op without pathspec
revision --simplify-merges: do not leave commits unprocessed
revision --simplify-merges: use decoration instead of commit->util field
Documentation: rev-list-options: move --simplify-merges documentation
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

1  2 
Documentation/rev-list-options.txt
git-filter-branch.sh
revision.c
revision.h
t/t7003-filter-branch.sh
Simple merge
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge
Simple merge