diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:38 -0700 |
| commit | 6296062285e07051a5a46cbbd74c67a10bf2ac16 (patch) | |
| tree | 1d4bb7d5ce2595bf288c3eac5f4e45e5673ea4e4 /revision.h | |
| parent | 304d8b6256db7aca7772c0a994a7c1c987eabd97 (diff) | |
| parent | 6d158cba282f22fa1548af1188f78042fed30aed (diff) | |
| download | git-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.gz git-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.xz | |
Merge branch 'tr/rev-list-count'
* tr/rev-list-count:
bash completion: Support "divergence from upstream" messages in __git_ps1
rev-list: introduce --count option
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 855464f14..36fdf22b2 100644 --- a/revision.h +++ b/revision.h @@ -57,6 +57,7 @@ struct rev_info { limited:1, unpacked:1, boundary:2, + count:1, left_right:1, rewrite_parents:1, print_parents:1, @@ -132,6 +133,10 @@ struct rev_info { /* notes-specific options: which refs to show */ struct display_notes_opt notes_opt; + + /* commit counts */ + int count_left; + int count_right; }; #define REV_TREE_SAME 0 |