diff options
| author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> | 2016-02-17 01:15:26 -0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:20:52 -0800 |
| commit | 1b47ad160b55f50a7a98c180e18d80f0f8f17a67 (patch) | |
| tree | 196dcd66914dca5b4a8329a7d54b599680a7074c /Documentation/merge-strategies.txt | |
| parent | d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb (diff) | |
| download | git-1b47ad160b55f50a7a98c180e18d80f0f8f17a67.tar.gz | |
merge-recursive: more consistent interface
Add strategy option find-renames, following git-diff interface. This
makes the option rename-threshold redundant.
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 1a5e1974a5..ff359b6ca2 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -85,11 +85,13 @@ no-renames;; Turn off rename detection. 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. + See also linkgit:git-diff[1] `--find-renames`. + rename-threshold=<n>;; - Controls the similarity threshold used for rename detection. - Re-enables rename detection if disabled by a preceding - `no-renames`. - 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 |