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

Re: [PATCH] Revert "Convert output messages in merge-recursive to past tense."

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 22, 2008, 22:37 UTC
Message-ID
<7v7ia87k2e.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1219425524-77545-1-git-send-email-maillist@steelskies.com>
Jonathan del Strother <maillist@steelskies.com> writes:
Show 8 quoted lines
> Now that the progress meter is gone, merge messages make more sense when presented in present tense
>
> This reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.
>
> Conflicts:
>
> 	builtin-merge-recursive.c
> ---

"Conflicts:"? Please either remove it or describe how you resolved the conflicts.

Sign-off?
The patch looked Ok to me.  Shawn?
Previous: Jonathan del StrotherNext: Shawn O. Pearce
Message 2 of 5 in “Revert "Convert output messages in merge-recursive to past tense."”
  1. Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother, Aug 22, 2008
  2. Junio C HamanoAug 22, 2008
  3. Shawn O. PearceAug 22, 2008
  4. Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother, Aug 23, 2008
  5. Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother, Aug 23, 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.