From: Gavin Guo <tuffkidtt@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Mathieu Malaterre <mathieu.malaterre@gmail.com>, git@vger.kernel.org
Subject: Re: duplicate commits after git rebase -i HEAD~10
Date: Wed, 15 Dec 2010 00:07:31 +0800 [thread overview]
Message-ID: <AANLkTimSAjHOc42LOwkbFxqGEKrR0sOTcZB_mA2Ttj09@mail.gmail.com> (raw)
In-Reply-To: <20101203153435.GA6069@sigill.intra.peff.net>
The first one:
> git checkout master
> git reset --hard HEAD^
> git merge your-branch
The second:
> git checkout tmp-branch M^
> git merge your-branch
> git rebase --onto tmp-branch M master
> git branch -d tmp-branch
I don't exactly know what the difference between the two methods to
solve the duplicate problem. Why if there is already a built under
master need to use the second solution? It seems the same to me to
solve the problem.
Gavin Guo
prev parent reply other threads:[~2010-12-14 16:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 15:04 duplicate commits after git rebase -i HEAD~10 Mathieu Malaterre
2010-12-03 15:34 ` Jeff King
2010-12-14 16:07 ` Gavin Guo [this message]
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=AANLkTimSAjHOc42LOwkbFxqGEKrR0sOTcZB_mA2Ttj09@mail.gmail.com \
--to=tuffkidtt@gmail.com \
--cc=git@vger.kernel.org \
--cc=mathieu.malaterre@gmail.com \
--cc=peff@peff.net \
/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).