Andrew's git / gitweb.git / diff
?
Merge branch 'zk/prompt-rebase-step'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 22:23:56 +0000 (15:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 May 2013 22:23:57 +0000 (15:23 -0700)
* zk/prompt-rebase-step:
bash-prompt.sh: show where rebase is at when stopped

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