git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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.

From
Jeff King <peff@peff.net>
Date
May 5, 2008, 17:05 UTC
Message-ID
<20080505170512.GD17863@sigill.intra.peff.net>
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
Previous: Avery PennarunNext: Tim Harper
Message 10 of 13 in “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.”
  1. 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, May 3, 2008
  2. Johannes SchindelinMay 3, 2008
  3. Tim HarperMay 3, 2008
  4. Junio C HamanoMay 3, 2008
  5. Tim HarperMay 3, 2008
  6. Junio C HamanoMay 4, 2008
  7. Avery PennarunMay 4, 2008
  8. Junio C HamanoMay 4, 2008
  9. Avery PennarunMay 5, 2008
  10. Jeff KingMay 5, 2008
  11. Tim HarperMay 6, 2008
  12. Johannes SchindelinMay 4, 2008
  13. Matt GrahamMay 3, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.