From: Jon Seymour <jon.seymour@gmail.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: RFD: best way to automatically rewrite a git DAG as a linear history?
Date: Mon, 22 Feb 2010 10:04:29 +1100 [thread overview]
Message-ID: <2cfc40321002211504o28069d16h4b9d1ef2230d03fe@mail.gmail.com> (raw)
In-Reply-To: <32541b131002191905u59a90866he0a38dfc661d45d2@mail.gmail.com>
On Sat, Feb 20, 2010 at 2:05 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> On Fri, Feb 19, 2010 at 9:25 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
>> (A hammer is, of course, a reasonably good tool for making things flat
>> although it does tend to break things along the way).
>
> Nice analogy. Well, thanks for the clarification and best of luck in
> your slightly crazy project :)
>
Thank you - FWIW, it is shaping up very well. In turns out that in
cases where the original merge was resolved in favour of the conflict,
the compensation can be squashed with the compensated commit -
effectively bring the eventual resolution forward in time.
This is so, so cool.
jon.
next prev parent reply other threads:[~2010-02-21 23:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 2:35 RFD: best way to automatically rewrite a git DAG as a linear history? Jon Seymour
2010-02-18 5:11 ` Jeff King
2010-02-18 18:38 ` Avery Pennarun
2010-02-19 1:04 ` Jon Seymour
2010-02-19 3:13 ` Avery Pennarun
2010-02-19 7:29 ` Jon Seymour
2010-02-19 20:20 ` Avery Pennarun
2010-02-20 2:25 ` Jon Seymour
2010-02-20 3:05 ` Avery Pennarun
2010-02-21 23:04 ` Jon Seymour [this message]
2010-02-21 23:18 ` Jon Seymour
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=2cfc40321002211504o28069d16h4b9d1ef2230d03fe@mail.gmail.com \
--to=jon.seymour@gmail.com \
--cc=apenwarr@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;
as well as URLs for NNTP newsgroup(s).