Code

rebase: cleanup rebasing with --merge
authorEric Wong <normalperson@yhbt.net>
Sun, 25 Jun 2006 01:29:48 +0000 (18:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Jun 2006 07:38:34 +0000 (00:38 -0700)
commit9e4bc7dd1bb9d92491c475cec55147fa0b3f954d
tree09a0762e5cee0122892e59d7ab3cd945f2a40d75
parent9a99c087da7cd6b4a41c19df3053542f645315c5
rebase: cleanup rebasing with --merge

We no longer have to recommit each patch to remove the parent
information we're rebasing since we're using the low-level merge
strategies directly instead of git-merge.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh