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
Junio C Hamano <gitster@pobox.com>
Date
May 3, 2008, 16:57 UTC
Message-ID
<7v3aozwcj6.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.00.0805031509170.30431@racer>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 6 quoted lines
> On Sat, 3 May 2008, Tim Harper wrote:
>
>> -			printf("%s: needs update\n", ce->name);
>> +			printf("%s: has changes\n", ce->name);
>
> How about "local changes"?

Aren't there Porcelain and end-user scripts that relies on the output by doing "sed -ne s'/: needs update$//p"?

Previous: Tim HarperNext: Tim Harper
Message 4 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.