diff options
| author |  Felipe Gonçalves Assis <felipeg.assis@gmail.com> | 2016-02-17 01:15:25 -0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:20:51 -0800 |
| commit | d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb (patch) | |
| tree | 2d4e5a3a245f8724b17da2810cf537ec9ff86852 /Documentation | |
| parent | Git 2.7 (diff) | |
| download | tgif-d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb.tar.xz | |
merge-recursive: option to disable renames
The recursive strategy turns on rename detection by default. Add a
strategy option to disable rename detection even for exact renames.
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 7bbd19b300..1a5e1974a5 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -81,8 +81,14 @@ 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`. + 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`. subtree[=<path>];; |