On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis <[email protected]> wrote: > 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 <[email protected]> > --- > diff --git a/Documentation/merge-strategies.txt > b/Documentation/merge-strategies.txt > @@ -81,8 +81,14 @@ no-renormalize;; > +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`.
I'm not sure that it is necessary to mention the "last one wins" rule here, but if you do so, does --no-renames documentation deserve similar treatment? > See also linkgit:git-diff[1] `-M`. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
