git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: gitster@pobox.com, git@vger.kernel.org,
	Jordan DE GEA <jordan.de-gea@ensimag.grenoble-inp.fr>,
	Samuel GROOT <samuel.groot@ensimag.grenoble-inp.fr>,
	Erwan MATHONIERE <erwan.mathoniere@ensimag.grenoble-inp.fr>,
	Tom RUSSELLO <tom.russello@ensimag.grenoble-inp.fr>
Subject: Re: [PATCH 2/6] doc: typeset long command-line options as literal
Date: Mon, 27 Jun 2016 15:04:22 -0400	[thread overview]
Message-ID: <20160627190422.GC9594@sigill.intra.peff.net> (raw)
In-Reply-To: <20160627174623.11084-2-Matthieu.Moy@imag.fr>

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

  reply	other threads:[~2016-06-27 19:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-27 17:46 [PATCH 1/6] doc: typeset short command-line options as literal Matthieu Moy
2016-06-27 17:46 ` [PATCH 2/6] doc: typeset long " Matthieu Moy
2016-06-27 19:04   ` Jeff King [this message]
2016-06-28  8:08     ` Matthieu Moy
2016-06-28 15:19       ` Junio C Hamano
2016-06-27 17:46 ` [PATCH 3/6] doc: typeset -- as litteral Matthieu Moy
2016-06-27 19:10   ` Jeff King
2016-06-28  8:26     ` Matthieu Moy
2016-06-27 17:46 ` [PATCH 4/6] doc: typeset long options with argument " Matthieu Moy
2016-06-27 17:46 ` [PATCH 5/6] CodingGuidelines: formatting HEAD in documentation Matthieu Moy
2016-06-27 17:46 ` [PATCH 6/6] doc: typeset HEAD and variants as litteral Matthieu Moy
2016-06-27 18:57 ` [PATCH 1/6] doc: typeset short command-line options as literal Jeff King
2016-06-28  8:31   ` Matthieu Moy
2016-06-28 11:40 ` [PATCH v2 0/7] literal formatting in documentation Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 1/7] Documentation/git-mv.txt: fix whitespace indentation Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 2/7] doc: typeset short command-line options as literal Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 3/7] doc: typeset long " Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 4/7] doc: typeset '--' " Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 5/7] doc: typeset long options with argument " Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 6/7] CodingGuidelines: formatting HEAD in documentation Matthieu Moy
2016-06-28 11:40   ` [PATCH v2 7/7] doc: typeset HEAD and variants as literal Matthieu Moy
2016-06-30  6:42   ` [PATCH v2 0/7] literal formatting in documentation Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160627190422.GC9594@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Matthieu.Moy@imag.fr \
    --cc=erwan.mathoniere@ensimag.grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jordan.de-gea@ensimag.grenoble-inp.fr \
    --cc=samuel.groot@ensimag.grenoble-inp.fr \
    --cc=tom.russello@ensimag.grenoble-inp.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).