diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-14 22:44:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-14 22:44:12 -0700 |
| commit | 300dd93306f4b2281cc05ab2ac809009c99cd713 (patch) | |
| tree | 5153dc74eeeb98fae7bb14923d32b757eb8d14e8 /revision.h | |
| parent | Merge branch 'jc/bottomless' into next (diff) | |
| parent | Fix up rev-list option parsing. (diff) | |
| download | tgif-300dd93306f4b2281cc05ab2ac809009c99cd713.tar.xz | |
Merge branch 'lt/logopt' into next
* lt/logopt:
Fix up rev-list option parsing.
Fix up default abbrev in setup_revisions() argument parser.
Common option parsing for "git log --diff" and friends
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 8970b57e3c..6eaa9048a9 100644 --- a/revision.h +++ b/revision.h @@ -38,13 +38,32 @@ struct rev_info { boundary:1, parents:1; + /* Diff flags */ + unsigned int diff:1, + full_diff:1, + show_root_diff:1, + no_commit_id:1, + verbose_header:1, + ignore_merges:1, + combine_merges:1, + dense_combined_merges:1, + always_show_header:1; + + /* Format info */ + unsigned int abbrev_commit:1; + unsigned int abbrev; + enum cmit_fmt commit_format; + const char *header_prefix; + const char *header; + /* special limits */ int max_count; unsigned long max_age; unsigned long min_age; - /* paths limiting */ + /* diff info for patches and for paths limiting */ struct diff_options diffopt; + struct diff_options pruning; topo_sort_set_fn_t topo_setter; topo_sort_get_fn_t topo_getter; |