Merge branch 'fc/show-branch-in-rebase-am' into maint
authorJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:38:16 +0000 (14:38 -0700)
committerJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:38:16 +0000 (14:38 -0700)
* fc/show-branch-in-rebase-am:
  prompt: fix for simple rebase

1  2 
contrib/completion/git-prompt.sh

Simple merge
git clone https://git.99rst.org/PROJECT