From: Junio C Hamano Date: Thu, 6 Jun 2013 19:18:41 +0000 (-0700) Subject: Merge branch 'fc/show-branch-in-rebase-am' X-Git-Tag: v1.8.4-rc0~204 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5adb37410198bc1d2413df9100bfd5c9f5d844f2 Merge branch 'fc/show-branch-in-rebase-am' The bash prompt code (in contrib/) displayed the name of the branch being rebased when "rebase -i/-m/-p" modes are in use, but not the plain vanilla "rebase". * fc/show-branch-in-rebase-am: prompt: fix for simple rebase --- 5adb37410198bc1d2413df9100bfd5c9f5d844f2