diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:25 -0800 |
| commit | 4ce064dd813279109a4003dee8c8b63077ab473d (patch) | |
| tree | c9ee63074543b9a0a6a116756c0d0b5d6f5c1847 /Documentation | |
| parent | Merge branch 'sb/submodule-fetch-nontip' (diff) | |
| parent | t3034: test deprecated interface (diff) | |
| download | tgif-4ce064dd813279109a4003dee8c8b63077ab473d.tar.xz | |
Merge branch 'fa/merge-recursive-no-rename'
"git merge-recursive" learned "--no-renames" option to disable its
rename detection logic.
* fa/merge-recursive-no-rename:
t3034: test deprecated interface
t3034: test option to disable renames
t3034: add rename threshold tests
merge-recursive: find-renames resets threshold
merge-strategies.txt: fix typo
merge-recursive: more consistent interface
merge-recursive: option to disable renames
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 7bbd19b300..2eb92b9327 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/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 |