git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
1b47ad1
)
merge-strategies.txt: fix typo
author
Felipe Gonçalves Assis
<redacted>
Sun, 21 Feb 2016 22:59:01 +0000
(19:59 -0300)
committer
Junio C Hamano
<redacted>
Mon, 22 Feb 2016 18:42:52 +0000
(10:42 -0800)
Signed-off-by: Felipe Gonçalves Assis <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/merge-strategies.txt
patch
|
blob
|
history
diff --git
a/Documentation/merge-strategies.txt
b/Documentation/merge-strategies.txt
index ff359b6ca23e4038fbe5b10bdf3aaf274f403264..2eb92b93274df9fb5002336114654fe869903808 100644
(file)
--- 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>;;
git clone https://git.99rst.org/PROJECT