From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Bryan Turner <bturner@atlassian.com>, Git Users <git@vger.kernel.org>
Subject: Re: [ANNOUNCE] Git v2.4.0-rc2
Date: Wed, 15 Apr 2015 22:53:39 -0700 [thread overview]
Message-ID: <CAPc5daXYgub5-qG2S7LdTuUAnut4B-qaSeQMNJpoGzORdvZpcA@mail.gmail.com> (raw)
In-Reply-To: <20150416022216.GA30991@peff.net>
On Wed, Apr 15, 2015 at 7:22 PM, Jeff King <peff@peff.net> wrote:
>
> In the meantime, unless somebody is planning to jump on this topic
> immediately (I am not), I think we can revert 2bf15a3330a from master.
> It's definitely fixing _a_ problem, but it's one we've lived with for
> many years already.
Yeah, I agree. Nobody should be reading the output to find CONFLICT
anyway (isn't "ls-files -u" for these scripts?), but the current error/info
levels do look inconsistent.
prev parent reply other threads:[~2015-04-16 5:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 21:48 [ANNOUNCE] Git v2.4.0-rc2 Junio C Hamano
2015-04-16 2:05 ` Bryan Turner
2015-04-16 2:22 ` Jeff King
2015-04-16 4:34 ` Randall S. Becker
2015-04-16 5:53 ` Junio C Hamano [this message]
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=CAPc5daXYgub5-qG2S7LdTuUAnut4B-qaSeQMNJpoGzORdvZpcA@mail.gmail.com \
--to=gitster@pobox.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--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.
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).