diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 20:07:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 20:07:02 (GMT) |
| commit | 23d58a00e55f0e5803e190ce861c5354cf19484a (patch) | |
| tree | a7d538999f104d3b6d3f6836eed28e7c0fee02b6 /builtin | |
| parent | 808d11926351018f73db69d54e5920adef578f62 (diff) | |
| parent | 95261974bbc8cc1a32ed260f06a694cde86f732d (diff) | |
| download | git-23d58a00e55f0e5803e190ce861c5354cf19484a.zip git-23d58a00e55f0e5803e190ce861c5354cf19484a.tar.gz git-23d58a00e55f0e5803e190ce861c5354cf19484a.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 6fc7bff..3b80e8f 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2691,7 +2691,7 @@ 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 { |