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

[PATCH v2 1/5] merge-strategies.txt: fix typo

From
FAFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Date
Feb 21, 2016, 22:59 UTC
Message-ID
<1456095545-20201-2-git-send-email-felipegassis@gmail.com>
In-Reply-To
<1456095545-20201-1-git-send-email-felipegassis@gmail.com>
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
---
 Documentation/merge-strategies.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index ff359b6..2eb92b9 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -86,8 +86,8 @@ no-renames;;
 	See also linkgit:git-diff[1] `--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.
 	See also linkgit:git-diff[1] `--find-renames`.
 
 rename-threshold=<n>;;
-- 
2.7.1.492.gd821b20
Previous: Felipe Gonçalves AssisNext: Felipe Gonçalves Assis
Message 2 of 11 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-strategies.txt: fix typoFelipe Gonçalves Assis, Feb 21, 2016
  3. 2/5 t3034: add rename threshold testsFelipe Gonçalves Assis, Feb 21, 2016
  4. Junio C HamanoFeb 22, 2016
  5. 3/5 t3034: test option to disable renamesFelipe Gonçalves Assis, Feb 21, 2016
  6. 4/5 t3034: test deprecated interfaceFelipe Gonçalves Assis, Feb 21, 2016
  7. 5/5 merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis, Feb 21, 2016
  8. Junio C HamanoFeb 22, 2016
  9. Felipe Gonçalves AssisFeb 22, 2016
  10. Junio C HamanoFeb 22, 2016
  11. Felipe Gonçalves AssisFeb 22, 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.