diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 21:40:05 -0700 |
| commit | 00b718e02d97c956cade8c1b4cbe29a9d3e92765 (patch) | |
| tree | 74f04a8d21f6903b066b77920bb59684ce7a5632 /revision.h | |
| parent | 70d9895ebcb8d401b569d28f049ad37fcb7b5ade (diff) | |
| parent | 65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff) | |
| download | git-00b718e02d97c956cade8c1b4cbe29a9d3e92765.tar.gz | |
Merge branch 'jc/post-simplify' into tr/rev-list-docs
* jc/post-simplify:
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
Conflicts:
Documentation/rev-list-options.txt
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h index f64e8ce7ff..dfa06b5210 100644 --- a/revision.h +++ b/revision.h @@ -41,6 +41,7 @@ struct rev_info { simplify_history:1, lifo:1, topo_order:1, + simplify_merges:1, tag_objects:1, tree_objects:1, blob_objects:1, |