Merge branch 'fc/show-branch-in-rebase-am' into maint

* fc/show-branch-in-rebase-am: prompt: fix for simple rebase

Junio C Hamano committed Jun 27, 2013 at 14:38 UTC c9cae1e28a050f115d7591ce1a68674c2067b54b

No changes.