summaryrefslogtreecommitdiffstats
path: root/builtin/show-ref.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-30 20:55:38 +0200
committerJunio C Hamano <gitster@pobox.com>2010-06-30 20:55:38 +0200
commit6296062285e07051a5a46cbbd74c67a10bf2ac16 (patch)
tree1d4bb7d5ce2595bf288c3eac5f4e45e5673ea4e4 /builtin/show-ref.c
parentMerge branch 'as/maint-completion-set-u-fix' (diff)
parentbash completion: Support "divergence from upstream" messages in __git_ps1 (diff)
downloadgit-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.xz
git-6296062285e07051a5a46cbbd74c67a10bf2ac16.zip
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 'builtin/show-ref.c')
0 files changed, 0 insertions, 0 deletions