git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.org>
Cc: GitList <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] rerere doc: quote `rerere.enabled`
Date: Mon, 08 Apr 2019 10:10:13 +0900	[thread overview]
Message-ID: <xmqq8swlcney.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190406132747.16376-2-philipoakley@iee.org> (Philip Oakley's message of "Sat, 6 Apr 2019 14:27:46 +0100")

Philip Oakley <philipoakley@iee.org> writes:

> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---
> Noticed while attempting to train the Git-for-Windows rebasing-
> merge series.
> ---
>  Documentation/git-rerere.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
> index df310d2a58..95763d7581 100644
> --- a/Documentation/git-rerere.txt
> +++ b/Documentation/git-rerere.txt
> @@ -24,7 +24,7 @@ on the initial manual merge, and applying previously recorded
>  hand resolutions to their corresponding automerge results.
>  
>  [NOTE]
> -You need to set the configuration variable rerere.enabled in order to
> +You need to set the configuration variable `rerere.enabled` in order to
>  enable this command.

OK.  That sounds good.

Thanks.

  reply	other threads:[~2019-04-08  1:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-06 13:27 [PATCH 0/2] Minor document fixes Philip Oakley
2019-04-06 13:27 ` [PATCH 1/2] rerere doc: quote `rerere.enabled` Philip Oakley
2019-04-08  1:10   ` Junio C Hamano [this message]
2019-04-06 13:27 ` [PATCH 2/2] describe doc: remove '7-char' abbreviation reference Philip Oakley
2019-04-07 20:05   ` Ævar Arnfjörð Bjarmason
2019-04-07 21:04     ` Junio C Hamano
2019-04-07 22:23     ` Philip Oakley

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

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

  git send-email \
    --in-reply-to=xmqq8swlcney.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=philipoakley@iee.org \
    /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. 
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 NNTP newsgroup(s).