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

Re: [PATCH 2/6] doc: typeset long command-line options as literal

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 28, 2016, 08:08 UTC
Message-ID
<vpqr3bhzqej.fsf@anie.imag.fr>
In-Reply-To
<20160627190422.GC9594@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 11 quoted lines
> On Mon, Jun 27, 2016 at 07:46:19PM +0200, Matthieu Moy wrote:
>
>>  grep.extendedRegexp::
>> -	If set to true, enable '--extended-regexp' option by default. This
>> -	option is ignored when the `grep.patternType` option is set to a value
>> +	If set to true, enable `--extended-regexp` option by default. This
>> +	option is ignored when the 'grep.patternType' option is set to a value
>
> What's going on in the second line here? We remove the backticks from
> grep.patternType (which is not even a thing that should be touched by
> your pattern).

Nice catch. What happened was that I initially wrote the series on top of master, then rebased it on top of tr/doc-tt to avoid conflicts when Junio merges both. I did check that re-applying the perl substitution was leading to the same patch, but apparently I did something wrong.

I re-rechecked, re-found this instance and no other. Fixed in v2.
Show 9 quoted lines
>> @@ -1916,7 +1916,7 @@ log.decorate::
>>  	command. If 'short' is specified, the ref name prefixes 'refs/heads/',
>>  	'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
>>  	specified, the full ref name (including prefix) will be printed.
>> -	This is the same as the log commands '--decorate' option.
>> +	This is the same as the log commands `--decorate` option.
>
> This one conflicts applying on top of master, but the resolution is
> fairly straightforward.

Sorry, I forgot to mention when sending the series: this is to be applied on top of tr/doc-tt (in next, marked "will merge to master").

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Jeff KingNext: Junio C Hamano
Message 10 of 22 in “doc: typeset short command-line options as literal”
  1. 1/6 doc: typeset short command-line options as literalMatthieu Moy, Jun 27, 2016
  2. 3/6 doc: typeset -- as litteralMatthieu Moy, Jun 27, 2016
  3. Jeff KingJun 27, 2016
  4. Matthieu MoyJun 28, 2016
  5. 4/6 doc: typeset long options with argument as litteralMatthieu Moy, Jun 27, 2016
  6. 5/6 CodingGuidelines: formatting HEAD in documentationMatthieu Moy, Jun 27, 2016
  7. 6/6 doc: typeset HEAD and variants as litteralMatthieu Moy, Jun 27, 2016
  8. 2/6 doc: typeset long command-line options as literalMatthieu Moy, Jun 27, 2016
  9. Jeff KingJun 27, 2016
  10. Matthieu MoyJun 28, 2016
  11. Junio C HamanoJun 28, 2016
  12. Jeff KingJun 27, 2016
  13. Matthieu MoyJun 28, 2016
  14. 0/7 literal formatting in documentationMatthieu Moy, Jun 28, 2016
  15. 7/7 doc: typeset HEAD and variants as literalMatthieu Moy, Jun 28, 2016
  16. 5/7 doc: typeset long options with argument as literalMatthieu Moy, Jun 28, 2016
  17. 1/7 Documentation/git-mv.txt: fix whitespace indentationMatthieu Moy, Jun 28, 2016
  18. 4/7 doc: typeset '--' as literalMatthieu Moy, Jun 28, 2016
  19. 3/7 doc: typeset long command-line options as literalMatthieu Moy, Jun 28, 2016
  20. 6/7 CodingGuidelines: formatting HEAD in documentationMatthieu Moy, Jun 28, 2016
  21. 2/7 doc: typeset short command-line options as literalMatthieu Moy, Jun 28, 2016
  22. Jeff KingJun 30, 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.