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

RE: merge --no-ff is NOT mentioned in help

From
VTVanderhoof, Tzadik <tzadik.vanderhoof@optum360.com>
Date
Nov 18, 2016, 14:51 UTC
Message-ID
<2C8817BDA27E034F8E9A669458E375EF2BFC37@APSWP0428.ms.ds.uhc.com>
In-Reply-To
<20161117222142.mca6lmhj5mvl4gbp@sigill.intra.peff.net>
Show 20 quoted lines
> On Thu, Nov 17, 2016 at 09:10:22AM -0800, Junio C Hamano wrote:
> 
> > People interested may want to try the attached single-liner patch to 
> > see how the output from _ALL_ commands that use parse-options API 
> > looks when given "-h".  It could be that the result may not be too 
> > bad.
> 
> The output is less ugly than I expected, but still a bit cluttered IMHO.
> I was surprised that the column-adjustment did not need tweaked, but the code correctly increments "pos" from the return value of fprintf, which just works.
> 
> Looking at the output for --ff, though:
> 
>    --[no-]ff             allow fast-forward (default)
> 
> I do not think it's improving the situation nearly as much as if we made the primary option "--no-ff" with a NONEG flga, and then added back in a HIDDEN "--ff". I thought we had done that in other cases, but I can't seem to find any. But it would make "--no-ff" the primary form, which makes sense, as "--ff" is already the default.
> 
> Another option would be to teach parse-options to somehow treat the negated form as primary in the help text. That's a bit more code, but might be usable in other places.
> 
> -Peff
>
What about leaving the help as is, but adding a sentence at the end (or beginning?) like: "The following options may be negated by adding 'no-' after the double dashes"?

This e-mail, including attachments, may include confidential and/or proprietary information, and may be used only by the person or entity to which it is addressed. If the reader of this e-mail is not the intended recipient or his or her authorized agent, the reader is hereby notified that any dissemination, distribution or copying of this e-mail is prohibited. If you have received this e-mail in error, please notify the sender by replying to this message and delete this e-mail immediately.

Previous: Jeff King
Message 9 of 9 in “merge --no-ff is NOT mentioned in help”
  1. Vanderhoof, TzadikNov 16, 2016
  2. Mike RappazzoNov 16, 2016
  3. Vanderhoof, TzadikNov 16, 2016
  4. Mike RappazzoNov 16, 2016
  5. Vanderhoof, TzadikNov 17, 2016
  6. Junio C HamanoNov 17, 2016
  7. Torsten BögershausenNov 17, 2016
  8. Jeff KingNov 17, 2016
  9. Vanderhoof, TzadikNov 18, 2016

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.