From: bill lam <cbill.lam@gmail.com>
To: git <git@vger.kernel.org>
Subject: Re: how to combine 2 commits?
Date: Tue, 13 Jan 2009 15:51:21 +0800 [thread overview]
Message-ID: <20090113075121.GA6923@b2j> (raw)
In-Reply-To: <200901122327.21102.bss@iguanasuicide.net>
On Mon, 12 Jan 2009, Boyd Stephen Smith Jr. wrote:
> git rebase --interactive (read "git help rebase" first)
I tried rebase the last 3 commit, but it failed.
bill@b2j:jproject$ git log --pretty=oneline | head
39ed365c11391bede0e1b6578adfac6619b78c0a for yajpp to use unix LF
70c812db2439bc84a8dd7ea831067b9ebf29885c revert last crlf error
f338a768d635b868e6fddaae670ad91d46ea7c4e format scripts
bill@b2j:jproject$ git rebase -i HEAD~3
error: Entry 'trunk/jcalc/mmenu-mm.ijs' not uptodate. Cannot merge.
fatal: merging of trees a1eafe6cdbb428f851d6ca878bbc53149fb7e7eb and
a00e6dcd3ec3f4ffde0d1aad1958db724093de69 failed
Could not apply 70c812d... revert last crlf error
It looks like cannot resolve conflict of linefeed changes. It was
expected all scripts will conflict, so I have to abort the rebase.
What is the procedure to generate a patch of the HEAD from HEAD~4,
then cancel all changes from HEAD~3 up to HEAD, and then apply the
patch to the previous HEAD~4 ?
BTW, what is the norm of reply in this list, should it be reply to
list only, or reply to group (list plus all cc)?
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩213 李商隱 無題二首之二
颯颯東風細雨來 芙蓉塘外有輕雷 金蟾齧璅燒香入 玉虎牽絲汲井迴
賈氏窺簾韓掾少 宓妃留枕魏王才 春心莫共花爭發 一寸想思一寸灰
next prev parent reply other threads:[~2009-01-13 7:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-13 4:54 how to combine 2 commits? bill lam
2009-01-13 5:08 ` Jeff Whiteside
2009-01-13 5:27 ` Boyd Stephen Smith Jr.
2009-01-13 5:32 ` Imran M Yousuf
2009-01-13 7:51 ` bill lam [this message]
2009-01-13 11:20 ` Stephen R. van den Berg
2009-01-13 6:35 ` Sitaram Chamarty
2009-01-13 6:48 ` Matthieu Moy
2009-01-13 11:32 ` Sitaram Chamarty
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=20090113075121.GA6923@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox