Merge branch 'mk/blame-error-message'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:01 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:02 +0000 (13:07 -0700)
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

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

1  2 
builtin/blame.c
diff --cc builtin/blame.c
index 6fc7bff9a37e7b9acf24eb65546dfb8e3c87c8fb,b5474690153bae66727de6f4d44d6e395eddb9e4..3b80e8fd75cc0743035642cb82a284271925c865
@@@ -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;