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

Re: Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 1, 2009, 21:00 UTC
Message-ID
<7vsko2hhbs.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<87bpuqvpfz.fsf@jidanni.org>
jidanni@jidanni.org writes:
> Moving the deprecated syntax moved to the end of the document.
> Or please at least stamp it *deprecated* in the SYNOPSIS, in case the
> user reads no further down the page.

To my mind, there is a difference between something being kept (and will be kept for foreseeable future), and something being deprecated (and eventual removal is at least contemplated). The original merge syntax falls into the first category, and the current description is correct and fine as-is.

The wording "for historical reasons" does not refer to the reason why the second syntax is still kept. It merely refers to the reason why two syntaxes exist in the first place.

Previous: jidanni@jidanni.org
Message 2 of 2 in “Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end”
  1. jidanni@jidanni.orgJan 1, 2009
  2. Junio C HamanoJan 1, 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.