| commit | fa99c1e1e16d347a354c817d96c5abbd5a08fcd8 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Sun, 6 Feb 2011 18:43:47 +0000 (6 13:43 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 22:08:09 +0000 (10 14:08 -0800) | ||
| tree | 300dc5833443b31b7f22481de7f8f404fbcb46b3 | treesnapshot (tar.gz zip) |
| parent | cb82a05d5e2277d2019c43cadf8abee8bc6f97b6 | commitdiff |
rebase: extract merge code to new source file
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>
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>
| .gitignore | diffblobblamehistory | |
| Makefile | diffblobblamehistory | |
| git-rebase--merge.sh | [new file with mode: 0644] | blob |
| git-rebase.sh | diffblobblamehistory |