Merge branch 'zk/prompt-rebase-step'

* zk/prompt-rebase-step: bash-prompt.sh: show where rebase is at when stopped

Junio C Hamano committed May 1, 2013 at 15:23 UTC b9347eb224d7b38f29893e75b6ca16a61647a4f2

No changes.