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

The error message from "git blame --contents --reverse" incorrectly talked about "--contents --children". * mk/blame-error-message: blame: fix option name in error message
git-mirror · Nov 3, 2015 · fdca2be · fdca2be
2 parents 5c15ca0 + 9526197
commit fdca2be
Showing 1 changed file with 1 addition and 1 deletion.
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 {