Skip to content

Commit

Permalink
Merge branch 'mk/blame-error-message'
Browse files Browse the repository at this point in the history
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message
  • Loading branch information
Junio C Hamano committed Oct 30, 2015
2 parents 808d119 + 9526197 commit 23d58a0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 23d58a0

Please sign in to comment.