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 /rerere.c | |
| parent | 304d8b6256db7aca7772c0a994a7c1c987eabd97 (diff) | |
| parent | 6d158cba282f22fa1548af1188f78042fed30aed (diff) | |
| download | git-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.gz | |
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 'rerere.c')
0 files changed, 0 insertions, 0 deletions