Merge branch 'zk/prompt-rebase-step'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 22:23:56 +0000 (15:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 22:23:57 +0000 (15:23 -0700)
commitb9347eb224d7b38f29893e75b6ca16a61647a4f2
tree049d66f4142adde81d99671df8bf0426d369132b
parent7e6a0cc47da79dd22c0338aee8750fda92ced5d9
parentb71dc3e1a04666fae4a4e282973d9b5a122a997c
Merge branch 'zk/prompt-rebase-step'

* zk/prompt-rebase-step:
  bash-prompt.sh: show where rebase is at when stopped
contrib/completion/git-prompt.sh
t/t9903-bash-prompt.sh