git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/5] merge-strategies.txt: fix typo

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Feb 21, 2016, 17:21 UTC
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:

Show 9 quoted lines
> 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`.
Previous: Felipe Gonçalves AssisNext: Felipe Gonçalves Assis
Message 5 of 16 in “Tests and fixes for merge-recursive rename options”
  1. 0/5 Tests and fixes for merge-recursive rename optionsFelipe Gonçalves Assis, Feb 21, 2016
  2. 1/5 merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis, Feb 21, 2016
  3. Eric SunshineFeb 21, 2016
  4. 2/5 merge-strategies.txt: fix typoFelipe Gonçalves Assis, Feb 21, 2016
  5. Eric SunshineFeb 21, 2016
  6. 3/5 merge-recursive: test rename threshold optionFelipe Gonçalves Assis, Feb 21, 2016
  7. Eric SunshineFeb 21, 2016
  8. Felipe Gonçalves AssisFeb 21, 2016
  9. Eric SunshineFeb 21, 2016
  10. Junio C HamanoFeb 21, 2016
  11. 4/5 merge-recursive: test option to disable renamesFelipe Gonçalves Assis, Feb 21, 2016
  12. Eric SunshineFeb 21, 2016
  13. 5/5 merge-recursive: test more consistent interfaceFelipe Gonçalves Assis, Feb 21, 2016
  14. Eric SunshineFeb 21, 2016
  15. Felipe Gonçalves AssisFeb 21, 2016
  16. Eric SunshineFeb 21, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.