From: Ilya Basin <basinilya@gmail.com>
Date: Thu, 16 Jun 2011 19:17:58 GMT
Subject: rewrite history
Message-ID: <362053118.20110616231758@gmail.com>

Hi list. There were 2 branches. One's HEAD was modified to match a
specific commit at another branch. Now, how to merge them according to
this scheme?

A---B---X---E---F
                     =>  C---D---X---E---F
C---D---X'

X and X' have no difference. I tried to write a script to cherry-pick
E and F, but some of commits are merges and cherry-pick fails.