diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 14:13:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 14:13:10 -0800 |
| commit | 76df4f76799400e688028a29f01197b675545f84 (patch) | |
| tree | 7c3757358cae00870963af7d540f83ea3d39b8c6 /merge-strategies.txt | |
| parent | 3fcdd0774d9c54ba3fd7344eed95570cd2e5f329 (diff) | |
| download | git-htmldocs-76df4f76799400e688028a29f01197b675545f84.tar.gz | |
Autogenerated HTML docs for v2.8.0-rc0
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 7bbd19b30..2eb92b932 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt @@ -81,9 +81,17 @@ no-renormalize;; Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable. +no-renames;; + Turn off rename detection. + See also linkgit:git-diff[1] `--no-renames`. + +find-renames[=<n>];; + Turn on rename detection, optionally setting the similarity + threshold. This is the default. + See also linkgit:git-diff[1] `--find-renames`. + rename-threshold=<n>;; - Controls the similarity threshold used for rename detection. - See also linkgit:git-diff[1] `-M`. + Deprecated synonym for `find-renames=<n>`. subtree[=<path>];; This option is a more advanced form of 'subtree' strategy, where |