Merge branch 'mk/blame-error-message' into maint

gitster · gitster · commit fdca2bed90a7 · 2015-11-03T15:32:43.000-08:00
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message
diff --git a/builtin/blame.c b/builtin/blame.c
@@ -2691,7 +2691,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 		sb.commits.compare = compare_commits_by_commit_date;
 	}
 	else if (contents_from)
-		die("--contents and --children do not blend well.");
+		die("--contents and --reverse do not blend well.");
 	else if (revs.first_parent_only)
 		die("combining --first-parent and --reverse is not supported");
 	else {

Original file line number	Diff line number	Diff line change
`@@ -2691,7 +2691,7 @@ int cmd_blame(int argc, const char *argv, const char prefix)`
`2691`	`2691`	`sb.commits.compare = compare_commits_by_commit_date;`
`2692`	`2692`	`}`
`2693`	`2693`	`else if (contents_from)`
`2694`		`- die("--contents and --children do not blend well.");`
	`2694`	`+ die("--contents and --reverse do not blend well.");`
`2695`	`2695`	`else if (revs.first_parent_only)`
`2696`	`2696`	`die("combining --first-parent and --reverse is not supported");`
`2697`	`2697`	`else {`