git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72e7192 1306321)
Merge branch 'fc/show-branch-in-rebase-am'
authorJunio C Hamano <redacted>
Thu, 6 Jun 2013 19:18:41 +0000 (12:18 -0700)
committerJunio C Hamano <redacted>
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
git clone https://git.99rst.org/PROJECT