Andrew's git / gitweb.git / diff
?
Merge branch 'fc/show-branch-in-rebase-am'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:18:41 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:18:41 +0000 (12:18 -0700)
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

1  2 
contrib/completion/git-prompt.sh patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-prompt.sh
Simple merge