From: Paolo Bonzini <bonzini@gnu.org>
To: git@vger.kernel.org
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Date: Fri, 06 Jun 2008 13:28:05 +0200 [thread overview]
Message-ID: <48491F45.3070100@gnu.org> (raw)
In-Reply-To: <E1K4a1Q-0002hq-QE@fencepost.gnu.org>
Paolo Bonzini wrote:
> The new strategy resolves only two heads, and the result of the merge
> is always the second head. It can be useful with `rebase --onto`,
> because it always resolves conflicts in favor of the commits
> being applied.
>
> The patch includes an update to git-rebase's documentation, showing
> how to use the new patch to convert an "--amend"ing commit into a
> separate one, as if --amend had not been used.
Signed-Off-By: Paolo Bonzini <bonzini@gnu.org>
(i.e. forge it in my original commit message if the patch is accepted).
Paolo
next prev parent reply other threads:[~2008-06-06 11:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 10:59 [PATCH] provide a new "theirs" strategy, useful for rebase --onto Paolo Bonzini
2008-06-06 11:27 ` Peter Karlsson
2008-06-06 11:28 ` Paolo Bonzini [this message]
2008-06-06 14:14 ` Miklos Vajna
2008-06-06 23:08 ` Junio C Hamano
2008-06-08 2:54 ` Paolo Bonzini
2008-06-08 8:16 ` Junio C Hamano
2008-06-08 13:38 ` Paolo Bonzini
2008-06-08 20:59 ` Junio C Hamano
2008-06-08 23:06 ` Paolo Bonzini
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=48491F45.3070100@gnu.org \
--to=bonzini@gnu.org \
--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).