From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sun, 21 Feb 2016 17:21:20 GMT
Subject: Re: [PATCH 2/5] merge-strategies.txt: fix typo
Message-ID: <CAPig+cTkTxGJAOy-CDFJHwOg=C3Mq9ZHNyqBZ_+S0wTXh_SHaA@mail.gmail.com>
In-Reply-To: <1456067358-19781-3-git-send-email-felipegassis@gmail.com>

On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis
<felipeg.assis@gmail.com> wrote:
> Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
> ---
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> @@ -86,8 +86,8 @@ no-renames;;
>  find-renames[=<n>];;
> -       Turn on rename detection, optionally setting the the similarity
> -       threshold. This is the default.
> +       Turn on rename detection, optionally setting the similarity
> +       threshold.  This is the default.

I'd probably have omitted the unimportant whitespace change on the
second line from the patch since it's just noise which distracts from
the real fix, but this alone is not worth a re-roll.

>         See also linkgit:git-diff[1] `--find-renames`.