From: Junio C Hamano Date: Wed, 3 Sep 2008 00:47:13 +0000 (-0700) Subject: Merge branch 'tr/filter-branch' X-Git-Tag: v1.6.1-rc1~275 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01914577ed42498d9e268684949d699e0272e964;p=git.git 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 --- 01914577ed42498d9e268684949d699e0272e964