These options take an optional argument, but this optional argument was not documented. While we're there, fix a typo in a comment in diffcore.h. Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx> --- Here's a new version. I've eliminated "line" from the wording. I'm still not sure I'm technically correct, especially about the interaction between "n" and "m" (the "A rewrite is considered when both thresholds are reached par of the patch). Documentation/diff-options.txt | 24 +++++++++++++++++++----- diffcore.h | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2371262..f1ab4e7 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -206,10 +206,22 @@ endif::git-format-patch[] the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`. --B:: - Break complete rewrite changes into pairs of delete and create. - --M:: +-B[<n>]:: +-B<n>/<m>:: + Break complete rewrite changes into pairs of delete and + create. When `n` and/or `m` are specified, they give threshold + (as a percentage of changed content) above which a change is + considered as complete rewrite. `n` is a threshold on the + similarity index (i.e. amount of addition/deletions compared + to the file's size). For example, `-B90%` means git will + detect a rewrite if more than 90% of the file's content have + been modified. `m` is a threshold on the disimilarity index + (i.e. amount of deletions from the old version). A rewrite is + considered when both thresholds are reached. When either `n` + or `m` is not specified, the default applies (`n` = 50% and + `m` = 60%). See linkgit:gitdiffcore[7] for more details. + +-M[<n>]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -218,9 +230,11 @@ ifdef::git-log[] For following files across renames while traversing history, see `--follow`. endif::git-log[] + If `n` is specified, it has the same meaning as for `-B<n>`. --C:: +-C[<n>]:: Detect copies as well as renames. See also `--find-copies-harder`. + If `n` is specified, it has the same meaning as for `-B<n>`. ifndef::git-format-patch[] --diff-filter=[ACDMRTUXB*]:: diff --git a/diffcore.h b/diffcore.h index 491bea0..fed9b15 100644 --- a/diffcore.h +++ b/diffcore.h @@ -18,7 +18,7 @@ #define MAX_SCORE 60000.0 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */ #define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%) */ -#define DEFAULT_MERGE_SCORE 36000 /* maximum for break-merge to happen 60%) */ +#define DEFAULT_MERGE_SCORE 36000 /* maximum for break-merge to happen (60%) */ #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ -- 1.7.2.1.10.g5cb67a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html