On Mon, Jun 27, 2016 at 07:46:19PM +0200, Matthieu Moy wrote:

> Similarly to the previous commit, use backquotes instead of
> forward-quotes, for long options.
> 
> This was obtained with:
> 
>   perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt
> 
> and manual tweak to remove false positive in ascii-art (o'--o'--o' to
> describe rewritten history).

These mostly looked good, but:

>  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).

> @@ -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.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to