rebase: remove merge mode
authorFelipe Contreras <felipe.contreras@gmail.com>
Sun, 9 Jun 2013 19:24:49 +0000 (14:24 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 30 Apr 2014 18:59:23 +0000 (13:59 -0500)
commit61010f94d530ba22d2f73f99eaace9c1eb061dde
tree341493605f10b7d82688cfa099114ac989f80894
parentaa2008456aa4f2add4567843faea7cadb3a172aa
rebase: remove merge mode

The cherrypick mode does the job.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
.gitignore
Makefile
git-rebase--interactive.sh
git-rebase--merge.sh [deleted file]
git-rebase.sh
t/t3406-rebase-message.sh
t/t3425-rebase-topology-merges.sh
t/t9903-bash-prompt.sh