Jeff King <peff@xxxxxxxx> writes: > 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. >> @@ -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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html