From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 25 Jun 2006 01:29:48 +0000 (-0700)
Subject: rebase: cleanup rebasing with --merge
X-Git-Tag: v1.4.1-rc2~22^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9e4bc7dd1bb9d92491c475cec55147fa0b3f954d?hp=9e4bc7dd1bb9d92491c475cec55147fa0b3f954d

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>
---