From: Junio C Hamano Date: Wed, 1 May 2013 22:23:56 +0000 (-0700) Subject: Merge branch 'zk/prompt-rebase-step' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b9347eb224d7b38f29893e75b6ca16a61647a4f2;p=git.git Merge branch 'zk/prompt-rebase-step' * zk/prompt-rebase-step: bash-prompt.sh: show where rebase is at when stopped --- b9347eb224d7b38f29893e75b6ca16a61647a4f2