rebase: extract merge code to new source file
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:47 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:09 +0000 (14:08 -0800)
commitfa99c1e...e16d347a354c817d96c5abbd5a08fcd8
tree300dc58...3443b31b7f22481de7f8f404fbcb46b3copy hash to clipboard (tree)
parentcb82a05...5e2277d2019c43cadf8abee8bc6f97b6copy hash to clipboard (diff)
.gitignore
Makefile
git-rebase--merge.sh [new file with mode: 0644]
git-rebase.sh