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

Re: [ANNOUNCE] Git 1.7.4-rc1

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 10, 2011, 17:11 UTC
Message-ID
<7v1v4k7kfx.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201101100221.34077.johan@herland.net>
Johan Herland <johan@herland.net> writes:
Show 10 quoted lines
> I can't find "git merge --abort" and "git notes merge" in this list. 
> Suggested paragraphs:
>
>  * "git merge" learned "--abort" option, synonymous to
>    "git reset --merge" when a merge is in progress.
>
>  * "git notes" learned the "merge" subcommand to merge notes refs.
>    In addition to the default manual conflict resolution, there are
>    also several notes merge strategies for automatically resolving
>    notes merge conflicts.
Thanks.
Previous: Junio C Hamano
Message 2 of 2 in “[ANNOUNCE] Git 1.7.4-rc1”
  1. Junio C HamanoJan 6, 2011
  2. Junio C HamanoJan 10, 2011

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.