From: "Shawn O. Pearce" <spearce@spearce.org>
To: Andreas Ericsson <ae@op5.se>
Cc: Stephen Haberman <stephen@exigencecorp.com>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/3] Prepare for non-interactive merge-preserving rebase
Date: Mon, 29 Sep 2008 09:11:06 -0700 [thread overview]
Message-ID: <20080929161106.GL17584@spearce.org> (raw)
In-Reply-To: <48E0FC86.3040001@op5.se>
Andreas Ericsson <ae@op5.se> wrote:
> Shawn O. Pearce wrote:
>> Andreas Ericsson <ae@op5.se> wrote:
>>> Shawn, I haven't seen this in any of your branches. Overlooked or
>>> dropped?
>>
>> Thanks for the reminder. It just got lost in the shuffle.
>
> Hold off on that if you haven't already applied them. I just noticed
> something strange in passing 15 minutes ago that I need to investigate
> a bit more. I need to get home now though, so I won't have time to
> test it further until later tonight.
Its only in a topic branch right now. I'll schedule them into 'pu'
today just so they are available, but I'll be happy to replace any
(or all) of the patches when you come up with something better.
--
Shawn.
next prev parent reply other threads:[~2008-09-29 16:12 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
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 [this message]
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=20080929161106.GL17584@spearce.org \
--to=spearce@spearce.org \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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).