From: bill lam <cbill.lam@gmail.com>
To: git <git@vger.kernel.org>
Subject: how to apply patch in the middle
Date: Thu, 15 Jan 2009 09:35:35 +0800 [thread overview]
Message-ID: <20090115013535.GB6937@b2j> (raw)
I want to change history to rewrite
- A - B - C - D - E - ..
as
- A - C' - D - E - ..
because rebase/squash cannot automatically resolve conflicts, I
generate a patch file from A to C
git diff A C >pat
However I don't know how apply this patch and cancel the old B and C.
Sorry for this newbie question.
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩008 杜甫 望嶽
岱宗夫如何 齊魯青未了 造化鍾神秀 陰陽割昏曉
盪胸生層雲 決眥入歸鳥 會當凌絕頂 一覽眾山小
next reply other threads:[~2009-01-15 1:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 1:35 bill lam [this message]
2009-01-15 1:39 ` how to apply patch in the middle Shawn O. Pearce
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=20090115013535.GB6937@b2j \
--to=cbill.lam@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.