From: Ilya Basin <basinilya@gmail.com>
To: git@vger.kernel.org
Subject: rewrite history
Date: Thu, 16 Jun 2011 23:17:58 +0400 [thread overview]
Message-ID: <362053118.20110616231758@gmail.com> (raw)
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.
next reply other threads:[~2011-06-16 19:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 19:17 Ilya Basin [this message]
2011-06-16 19:26 ` rewrite history Jeff King
2011-06-16 19:43 ` Junio C Hamano
2011-06-16 19:49 ` Jeff King
2011-06-16 20:06 ` Re[2]: " Ilya Basin
2011-06-16 20:13 ` Jeff King
2011-06-16 21:55 ` Re[2]: " Ilya Basin
2011-06-16 22:18 ` Re[3]: " Ilya Basin
2011-06-16 21:33 ` Marc Branchaud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=362053118.20110616231758@gmail.com \
--to=basinilya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).