From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:42 +0000 (-0800)
Subject: Merge branch 'mk/blame-error-message' into maint
X-Git-Tag: v2.6.3~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fdca2bed90a7991f2a3afc6a463e45acb03487ac

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
---

fdca2bed90a7991f2a3afc6a463e45acb03487ac
diff --cc builtin/blame.c
index 295ce92da5,b547469015..6cac59c973
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2691,9 -2677,7 +2691,9 @@@ parse_done
  		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 {
  		final_commit_name = prepare_initial(&sb);
  		sb.commits.compare = compare_commits_by_reverse_commit_date;