From: Jeff King <peff@peff.net>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Tim Harper <timcharper@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.
Date: Mon, 5 May 2008 13:05:12 -0400 [thread overview]
Message-ID: <20080505170512.GD17863@sigill.intra.peff.net> (raw)
In-Reply-To: <32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com>
On Mon, May 05, 2008 at 12:35:06PM -0400, Avery Pennarun wrote:
> Hmm, perhaps the problem then is that we're using plumbing output and
> presenting it to the user as part of the porcelain. Is there an
> elegant way to fix that?
2>&1 | sed 's/needs update/has local changes/' ?
Oh wait, you said elegant...
-Peff
next prev parent reply other threads:[~2008-05-05 17:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-03 7:08 [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer Tim Harper
2008-05-03 14:09 ` Johannes Schindelin
2008-05-03 16:19 ` Tim Harper
2008-05-03 16:57 ` Junio C Hamano
2008-05-03 20:10 ` Tim Harper
2008-05-04 0:08 ` Junio C Hamano
2008-05-04 0:21 ` Avery Pennarun
2008-05-04 1:24 ` Junio C Hamano
2008-05-05 16:35 ` Avery Pennarun
2008-05-05 17:05 ` Jeff King [this message]
2008-05-06 21:50 ` Tim Harper
2008-05-04 9:29 ` Johannes Schindelin
2008-05-03 15:24 ` Matt Graham
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=20080505170512.GD17863@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=timcharper@gmail.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).