From: Sverre Rabbelier <srabbelier@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Dec 2010, #04; Mon, 13)
Date: Mon, 13 Dec 2010 09:42:44 +0100 [thread overview]
Message-ID: <AANLkTikuahTgKb84bX18m62XHN4Rskkg8_D7fxTsg7RR@mail.gmail.com> (raw)
In-Reply-To: <7v7hfe5awz.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Dec 13, 2010 at 09:34, Junio C Hamano <gitster@pobox.com> wrote:
> * ab/i18n (2010-10-07) 161 commits
[snip]
> It is getting ridiculously painful to keep re-resolving the conflicts with
> other topics in flight, even with the help with rerere.
>
> Needs a bit more minor work to get the basic code structure right.
Can we perhaps get this into such a shape that it can be merged to
next as the first order of business after the next release?
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2010-12-13 8:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 8:34 What's cooking in git.git (Dec 2010, #04; Mon, 13) Junio C Hamano
2010-12-13 8:42 ` Sverre Rabbelier [this message]
2010-12-13 11:47 ` Ævar Arnfjörð Bjarmason
2010-12-14 2:20 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTikuahTgKb84bX18m62XHN4Rskkg8_D7fxTsg7RR@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).