On Thu, Feb 4, 2010 at 1:46 PM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html