diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:47:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:47:13 (GMT) |
| commit | 01914577ed42498d9e268684949d699e0272e964 (patch) | |
| tree | a0405b854b76eeb5b90b7f13ebd3607a655fb2cf /git-merge-octopus.sh | |
| parent | 53b543ab8218cede7fb9383298c00dcef663692c (diff) | |
| parent | e910ce30e41ae4ddc20a64661e8cf2702433e5db (diff) | |
| download | git-01914577ed42498d9e268684949d699e0272e964.zip git-01914577ed42498d9e268684949d699e0272e964.tar.gz git-01914577ed42498d9e268684949d699e0272e964.tar.bz2 | |
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
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions