From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2015 20:07:01 +0000 (-0700)
Subject: Merge branch 'mk/blame-error-message'
X-Git-Tag: v2.7.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23d58a00e55f0e5803e190ce861c5354cf19484a;p=thirdparty%2Fgit.git

Merge branch 'mk/blame-error-message'

The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message
---

23d58a00e55f0e5803e190ce861c5354cf19484a
diff --cc builtin/blame.c
index 6fc7bff9a3,b547469015..3b80e8fd75
--- 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;