From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:38:16 +0000 (-0700)
Subject: Merge branch 'fc/show-branch-in-rebase-am' into maint
X-Git-Tag: v1.8.3.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9cae1e28a050f115d7591ce1a68674c2067b54b;p=thirdparty%2Fgit.git

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

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

c9cae1e28a050f115d7591ce1a68674c2067b54b