From: Andreas Ericsson <ae@op5.se>
To: Stephen Haberman <stephen@exigencecorp.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Shawn Pearce <spearce@spearce.org>
Subject: Re: [PATCH 1/3] Prepare for non-interactive merge-preserving rebase
Date: Sat, 27 Sep 2008 19:55:18 +0200 [thread overview]
Message-ID: <48DE7386.2080808@op5.se> (raw)
In-Reply-To: <20080923162211.d4b15373.stephen@exigencecorp.com>
Stephen Haberman wrote:
>> Stephen, I had to modify the tests a bit to get them to work with how
>> I implemented the merge-preserving rebase, and also to remove a lot of
>> the cruft that was previously in there. Hope you're ok with the
>> attribution in the commit message.
>
> No problem, it looks great.
>
> This is awesome. Thanks for the insanely short turnaround. The
> GIT_EDITOR=: hack is neat. I did not think it would be that simple.
>
Stephen, are you using this in production? How's it turning out?
Shawn, I haven't seen this in any of your branches. Overlooked or
dropped? I think 1-2 are probably master material, while I'm not
so sure about 3/3. Would you prefer a re-send that turns it into
a 2-patch series, adding each test with the functionality it tests?
Let me know how you want it and I'll work something up tomorrow
morning, gmt + 1.
Thanks
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2008-09-27 17:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-23 20:57 [PATCH 1/3] Prepare for non-interactive merge-preserving rebase Andreas Ericsson
2008-09-23 21:22 ` Stephen Haberman
2008-09-23 21:30 ` Andreas Ericsson
2008-09-24 0:10 ` SZEDER Gábor
2008-09-24 6:17 ` Johannes Sixt
2008-09-24 7:13 ` Andreas Ericsson
2008-10-15 8:07 ` Stephen Haberman
2008-09-27 17:55 ` Andreas Ericsson [this message]
2008-09-27 19:20 ` Stephen Haberman
2008-09-29 16:01 ` Shawn O. Pearce
2008-09-29 16:04 ` Andreas Ericsson
2008-09-29 16:11 ` Shawn O. Pearce
2008-10-01 20:27 ` [PATCH] Add branch.autosetuppreservemerges and branch.<name>.preservemerges Stephen Haberman
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=48DE7386.2080808@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
--cc=stephen@exigencecorp.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.