From: Jon Seymour <jon.seymour@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Phil Hord <phil.hord@gmail.com>,
J Robert Ray <jrobertray@gmail.com>,
Thomas Rast <trast@student.ethz.ch>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: rebase -p loses amended changes
Date: Thu, 5 Apr 2012 09:05:16 +1000 [thread overview]
Message-ID: <CAH3AnrphGmrZSxALP3j3ADt6Cg4Tr2O83mcDBU2LfUdpdtUCUw@mail.gmail.com> (raw)
In-Reply-To: <7vlimb6r37.fsf@alter.siamese.dyndns.org>
On Thu, Apr 5, 2012 at 8:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Jon Seymour <jon.seymour@gmail.com> writes:
>
>> Are there any flaws, I wonder?
>
> It all depends on how close the base is to M^1. The difference might make
> it unnecessary (or even more necessary) to do any evil merge.
True. I guess it is still true there are no perfect solutions in this
area. This does seem like a step in a better direction, though.
jon.
next prev parent reply other threads:[~2012-04-04 23:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <592E2EEC-6CBA-48D6-8D44-34A971DD78EC@gmail.com>
2012-03-31 5:55 ` rebase -p loses amended changes Jon Seymour
2012-03-31 9:35 ` Thomas Rast
2012-03-31 9:39 ` Jon Seymour
2012-04-03 18:55 ` J Robert Ray
2012-04-03 21:43 ` Jon Seymour
2012-04-03 22:02 ` Junio C Hamano
2012-04-03 22:09 ` Phil Hord
2012-04-04 6:30 ` Johannes Sixt
2012-04-04 17:11 ` Junio C Hamano
2012-04-04 20:26 ` Junio C Hamano
2012-04-04 22:55 ` Jon Seymour
2012-04-04 22:59 ` Junio C Hamano
2012-04-04 23:05 ` Jon Seymour [this message]
2012-04-04 23:20 ` Junio C Hamano
2012-04-05 16:16 ` Martin von Zweigbergk
2012-04-05 16:33 ` Jon Seymour
2012-04-05 16:43 ` Martin von Zweigbergk
2012-04-10 7:14 ` Johannes Sixt
2012-03-30 21:31 J Robert Ray
2012-03-30 22:49 ` Thomas Rast
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=CAH3AnrphGmrZSxALP3j3ADt6Cg4Tr2O83mcDBU2LfUdpdtUCUw@mail.gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrobertray@gmail.com \
--cc=phil.hord@gmail.com \
--cc=trast@student.ethz.ch \
/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).