From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 May 2013 22:23:56 +0000 (-0700)
Subject: Merge branch 'zk/prompt-rebase-step'
X-Git-Tag: v1.8.3-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9347eb224d7b38f29893e75b6ca16a61647a4f2;p=thirdparty%2Fgit.git

Merge branch 'zk/prompt-rebase-step'

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

b9347eb224d7b38f29893e75b6ca16a61647a4f2