Code

rebase: extract merge code to new source file
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Tue, 28 Dec 2010 09:30:35 +0000 (10:30 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 23:05:06 +0000 (15:05 -0800)
commit72c44f03544479448a06aa65ba4b451e872cff38
treeca58f4551bad5626b7f91e23593a59f5b52c214d
parent84c23469f2cf335f855800f1784f59e11f4cc1af
rebase: extract merge code to new source file

Extract the code for merge-based rebase to git-rebase--merge.sh.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitignore
Makefile
git-rebase--merge.sh [new file with mode: 0644]
git-rebase.sh