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

Re: [PATCH] Grammar fixes to "merge" and "patch-id" docs

From
Jeff King <peff@peff.net>
Date
Mar 26, 2009, 02:20 UTC
Message-ID
<20090326022006.GB5835@coredump.intra.peff.net>
In-Reply-To
<7vocvp310v.fsf@gitster.siamese.dyndns.org>
On Wed, Mar 25, 2009 at 11:33:52AM -0700, Junio C Hamano wrote:
Show 7 quoted lines
> Wincent Colaiuta <win@wincent.com> writes:
> 
> >  If you tried a merge which resulted in a complex conflicts and
> > -would want to start over, you can recover with 'git-reset'.
> > +want to start over, you can recover with 'git-reset'.
> 
> Reads Ok to me either way...

Wincent gave a more complete explanation, and I think he is right about this change. But while reading this I also noticed "... a complex conflicts ..." in the context line which should be just "complex conflicts".

-Peff
Previous: Wincent ColaiutaNext: Wincent Colaiuta
Message 4 of 5 in “Grammar fixes to "merge" and "patch-id" docs”
  1. Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta, Mar 25, 2009
  2. Junio C HamanoMar 25, 2009
  3. Wincent ColaiutaMar 25, 2009
  4. Jeff KingMar 26, 2009
  5. Grammar fix for "git merge" man pageWincent Colaiuta, Mar 26, 2009

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.