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

Re: git-merge: inconsistent manual page.

From
SOSergei Organov <osv@javad.com>
Date
Oct 30, 2007, 19:32 UTC
Message-ID
<87wst44cvb.fsf@osv.gnss.ru>
In-Reply-To
<7vk5p4l9gs.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Subject: git-merge: document but discourage the historical syntax
>
> Historically "git merge" took its command line arguments in a
> rather strange order.  Document the historical syntax, and also
> document clearly that it is not encouraged in new scripts.
>
> There is no reason to deprecate the historical syntax, as the
> current code can sanely tell which syntax the caller is using,
> and existing scripts by people do use the historical syntax.

OK, your patch is better than what I've suggested. The only thing that your patch seems to be missing is prepending -m to <msg>:: in the OPTIONS section. Yeah, it could be more strict to just describe <msg>, but if there were no historical syntax, then you'd put '-m <msg>' description in, right? So the latter might be better anyway.

-- 
Sergei.
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 5 in “git-merge: inconsistent manual page.”
  1. Sergei OrganovOct 30, 2007
  2. Junio C HamanoOct 30, 2007
  3. Junio C HamanoOct 30, 2007
  4. Sergei OrganovOct 30, 2007
  5. Junio C HamanoOct 31, 2007

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.