From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Dec 2010 20:58:59 +0000 (-0800)
Subject: Merge branch 'kb/diff-C-M-synonym'
X-Git-Tag: v1.7.4-rc0~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cf7a64b54afe28ff61b362abc04399de383977e0;p=git.git

Merge branch 'kb/diff-C-M-synonym'

* kb/diff-C-M-synonym:
  diff: use "find" instead of "detect" as prefix for long forms of -M and -C
  diff: add --detect-copies-harder as a synonym for --find-copies-harder
---

cf7a64b54afe28ff61b362abc04399de383977e0
diff --cc diff.c
index 6991ed4e1,b5ef1ec55..0a4386943
--- a/diff.c
+++ b/diff.c
@@@ -3152,16 -3148,16 +3152,16 @@@ int diff_opt_parse(struct diff_options 
  	else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") ||
  		 !strcmp(arg, "--break-rewrites")) {
  		if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
 -			return -1;
 +			return error("invalid argument to -B: %s", arg+2);
  	}
- 	else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--detect-renames=") ||
- 		 !strcmp(arg, "--detect-renames")) {
+ 	else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
+ 		 !strcmp(arg, "--find-renames")) {
  		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
 -			return -1;
 +			return error("invalid argument to -M: %s", arg+2);
  		options->detect_rename = DIFF_DETECT_RENAME;
  	}
- 	else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") ||
- 		 !strcmp(arg, "--detect-copies")) {
+ 	else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
+ 		 !strcmp(arg, "--find-copies")) {
  		if (options->detect_rename == DIFF_DETECT_COPY)
  			DIFF_OPT_SET(options, FIND_COPIES_HARDER);
  		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)