Merge branch 'fc/show-branch-in-rebase-am' into maint
commitc9cae1e28a050f115d7591ce1a68674c2067b54b
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:16 +0000 (27 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:16 +0000 (27 14:38 -0700)
treefba2d3e25ade64bef99f0093a8078c751eb12e84
parentf79467ef364eb06ee9b49344cdec02e2bd1f2cc7
parent1306321ebea4d789974f0d58062664cc35c411e8
Merge branch 'fc/show-branch-in-rebase-am' into maint

* fc/show-branch-in-rebase-am:
  prompt: fix for simple rebase
contrib/completion/git-prompt.sh