diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:47:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:47:13 -0700 |
| commit | 01914577ed42498d9e268684949d699e0272e964 (patch) | |
| tree | a0405b854b76eeb5b90b7f13ebd3607a655fb2cf /revision.h | |
| parent | 53b543ab8218cede7fb9383298c00dcef663692c (diff) | |
| parent | e910ce30e41ae4ddc20a64661e8cf2702433e5db (diff) | |
| download | git-01914577ed42498d9e268684949d699e0272e964.tar.gz git-01914577ed42498d9e268684949d699e0272e964.tar.xz | |
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 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 91f194478..fc23522b3 100644 --- a/revision.h +++ b/revision.h @@ -42,6 +42,7 @@ struct rev_info { simplify_history:1, lifo:1, topo_order:1, + simplify_merges:1, tag_objects:1, tree_objects:1, blob_objects:1, @@ -110,6 +111,7 @@ struct rev_info { struct reflog_walk_info *reflog_info; struct decoration children; + struct decoration merge_simplification; }; #define REV_TREE_SAME 0 |