diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:05:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:05:02 -0700 |
| commit | c74815261225e5068490583b08303d158837ab9e (patch) | |
| tree | 743167de294292e8b0dcab0a1b9f2f8e22b8b504 /revision.h | |
| parent | Merge branch 'jk/maint-send-email-compose' (diff) | |
| parent | graph API: eliminate unnecessary indentation (diff) | |
| download | tgif-c74815261225e5068490583b08303d158837ab9e.tar.xz | |
Merge branch 'as/graph'
* as/graph:
graph API: eliminate unnecessary indentation
log and rev-list: add --graph option
Add history graph API
revision API: split parent rewriting and parent printing options
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/revision.h b/revision.h index 31217f8c67..abce5001f1 100644 --- a/revision.h +++ b/revision.h @@ -46,7 +46,8 @@ struct rev_info { unpacked:1, /* see also ignore_packed below */ boundary:2, left_right:1, - parents:1, + rewrite_parents:1, + print_parents:1, reverse:1, cherry_pick:1, first_parent_only:1; @@ -65,7 +66,8 @@ struct rev_info { /* Format info */ unsigned int shown_one:1, abbrev_commit:1, - use_terminator:1; + use_terminator:1, + missing_newline:1; enum date_mode date_mode; const char **ignore_packed; /* pretend objects in these are unpacked */ @@ -88,6 +90,9 @@ struct rev_info { /* Filter by commit log message */ struct grep_opt *grep_filter; + /* Display history graph */ + struct git_graph *graph; + /* special limits */ int skip_count; int max_count; |