From: Junio C Hamano <gitster@pobox.com>
To: Paolo Bonzini <bonzini@gnu.org>
Cc: Git Mailing List <git@vger.kernel.org>, s-beyer@gmx.net
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Date: Sun, 08 Jun 2008 13:59:16 -0700 [thread overview]
Message-ID: <7vk5gziqxn.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 484BE0BE.1050102@gnu.org
Paolo Bonzini <bonzini@gnu.org> writes:
> #! /bin/sh
> # git-merge-after-amend <branch>
> #
> # Makes it possible to do a fast-forward merge of <branch>
> # into HEAD, assuming that the first diverging commit of <branch>
> # is an --amend'ed version of the first diverging commit of HEAD.
Can this strong special case limitation "only the first one can be the
amend" somehow be loosened? Otherwise I suspect it would not be useful as
a general solution.
next prev parent reply other threads:[~2008-06-08 21:00 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
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 [this message]
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=7vk5gziqxn.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.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).