diff options
| author |  Kevin Ballard <kevin@sb.org> | 2010-09-27 16:58:25 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:15:56 -0700 |
| commit | 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 (patch) | |
| tree | 9f51a2c9fabad753a2840f4d33023bed3c8d19c9 /Documentation | |
| parent | merge-recursive: options to ignore whitespace changes (diff) | |
| download | tgif-10ae7526bebb505ddddba01f76ec97d5f7b5e0e5.tar.xz | |
merge-recursive: option to specify rename threshold
The recursive merge strategy turns on rename detection but leaves the
rename threshold at the default. Add a strategy option to allow the user
to specify a rename threshold to use.
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 91faba5da9..77f26061d6 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -74,6 +74,10 @@ no-renormalize;; Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable. +rename-threshold=<n>;; + Controls the similarity threshold used for rename detection. + See also linkgit:git-diff[1] `-M`. + subtree[=path];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to |