From: "Felipe Gonçalves Assis" <felipeg.assis@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, gitster@pobox.com,
sunshine@sunshineco.com,
"Felipe Gonçalves Assis" <felipegassis@gmail.com>
Subject: [PATCH 2/5] merge-strategies.txt: fix typo
Date: Sun, 21 Feb 2016 12:09:15 -0300 [thread overview]
Message-ID: <1456067358-19781-3-git-send-email-felipegassis@gmail.com> (raw)
In-Reply-To: <1456067358-19781-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.gc9722f8
next prev parent reply other threads:[~2016-02-21 18:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-21 15:09 [PATCH 0/5] Tests and fixes for merge-recursive rename options Felipe Gonçalves Assis
2016-02-21 15:09 ` [PATCH 1/5] merge-recursive: find-renames resets threshold Felipe Gonçalves Assis
2016-02-21 17:18 ` Eric Sunshine
2016-02-21 15:09 ` Felipe Gonçalves Assis [this message]
2016-02-21 17:21 ` [PATCH 2/5] merge-strategies.txt: fix typo Eric Sunshine
2016-02-21 15:09 ` [PATCH 3/5] merge-recursive: test rename threshold option Felipe Gonçalves Assis
2016-02-21 17:52 ` Eric Sunshine
2016-02-21 18:55 ` Felipe Gonçalves Assis
2016-02-21 20:45 ` Eric Sunshine
2016-02-21 23:15 ` Junio C Hamano
2016-02-21 15:09 ` [PATCH 4/5] merge-recursive: test option to disable renames Felipe Gonçalves Assis
2016-02-21 18:01 ` Eric Sunshine
2016-02-21 15:09 ` [PATCH 5/5] merge-recursive: test more consistent interface Felipe Gonçalves Assis
2016-02-21 18:40 ` Eric Sunshine
2016-02-21 19:55 ` Felipe Gonçalves Assis
2016-02-21 20:32 ` Eric Sunshine
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=1456067358-19781-3-git-send-email-felipegassis@gmail.com \
--to=felipeg.assis@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=felipegassis@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/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).