From: Jay Soffian Date: Thu, 04 Feb 2010 19:57:13 GMT Subject: Re: rebase vs rebase -i Message-ID: <76718491002041157o37de139brb7995076274375aa@mail.gmail.com> In-Reply-To: On Thu, Feb 4, 2010 at 1:46 PM, Johannes Schindelin wrote: > Both "rebase -i" and "rebase -m" are really a cherry-pick in a loop. Well then I'm still confused. I see where pick_one() in git-rebase--interactive.sh is using cherry-pick. But call_merge() in git-rebase.sh is using git-merge-recursive (absent specifying another strategy). ? j.