Merge branch 'tr/filter-branch'
commit01914577ed42498d9e268684949d699e0272e964
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:47:13 +0000 (2 17:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:47:13 +0000 (2 17:47 -0700)
treea0405b854b76eeb5b90b7f13ebd3607a655fb2cf
parent53b543ab8218cede7fb9383298c00dcef663692c
parente910ce30e41ae4ddc20a64661e8cf2702433e5db
Merge branch 'tr/filter-branch'

* 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
Documentation/rev-list-options.txt
git-filter-branch.sh
revision.c
revision.h
t/t7003-filter-branch.sh