From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH v3] Give the hunk comment its own color
Date: Mon, 30 Nov 2009 09:09:22 +0100 [thread overview]
Message-ID: <fabb9a1e0911300009j1574c06cy500dde75fc68662f@mail.gmail.com> (raw)
In-Reply-To: <7vtywcwj1o.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Nov 30, 2009 at 08:47, Junio C Hamano <gitster@pobox.com> wrote:
> I'll merge the updated (i.e. rewound and then rebuilt) tip
> of the topic branch when the topic graduates to the master (hopefully
> before 1.6.6-rc1), so we won't see the botched one in the end result.
I'm curious how you do this. Do you keep a list of replacements, that
is "when merging branch foo from next to master, instead merge bar",
or is it something the original author should remind you of when it's
time to merge to master?
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-11-30 8:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-18 11:30 [PATCH] Give the hunk comment its own color Bert Wesarg
2009-11-18 11:44 ` Tay Ray Chuan
2009-11-18 11:57 ` Bert Wesarg
2009-11-18 14:23 ` Jeff King
2009-11-18 15:16 ` Bert Wesarg
2009-11-18 21:56 ` Junio C Hamano
2009-11-18 22:44 ` Jeff King
2009-11-26 12:05 ` Bert Wesarg
2009-11-27 2:38 ` Junio C Hamano
2009-11-27 6:29 ` Bert Wesarg
2009-11-27 6:52 ` Jeff King
2009-11-27 7:27 ` Junio C Hamano
2009-11-27 6:55 ` [PATCH v3] " Bert Wesarg
2009-11-27 8:38 ` Junio C Hamano
2009-11-27 8:44 ` Bert Wesarg
2009-11-27 8:59 ` Junio C Hamano
2009-11-28 5:52 ` Junio C Hamano
2009-11-28 12:08 ` Bert Wesarg
2009-11-30 7:07 ` Bert Wesarg
2009-11-30 7:15 ` Junio C Hamano
2009-11-30 7:41 ` Bert Wesarg
2009-11-30 7:47 ` Junio C Hamano
2009-11-30 8:09 ` Sverre Rabbelier [this message]
2009-11-30 9:00 ` Junio C Hamano
2009-11-30 9:26 ` Sverre Rabbelier
2009-11-18 15:11 ` [PATCH v2] " Bert Wesarg
2009-11-18 15:17 ` Jason Sewall
2009-11-18 15:20 ` Bert Wesarg
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=fabb9a1e0911300009j1574c06cy500dde75fc68662f@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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).