jidanni@jidanni.orgSigned-off-by: jidanni <jidanni@jidanni.org> --- Documentation/diff-options.txt | 4 ++-- Documentation/merge-strategies.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Show changes to 2 files +3 −3
Documentation/diff-options.txt, Documentation/merge-strategies.txt
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b432d25..9cd162f 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -143,11 +143,11 @@ endif::git-format-patch[] that matches other criteria, nothing is selected. --find-copies-harder:: - For performance reasons, by default, `-C` option finds copies only + For performance reasons, by default, the `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of - copy. This is a very expensive operation for large + the copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect. diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 1276f85..3cef90a 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -11,7 +11,7 @@ resolve:: recursive:: This can only resolve two heads using 3-way merge algorithm. When there are more than one common - ancestors that can be used for 3-way merge, it creates a + ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without
-- 1.6.0.6
