summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-101-0/+154
Extract the code for merge-based rebase to git-rebase--merge.sh. Suggested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>