diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 23:32:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 23:32:43 (GMT) |
| commit | fdca2bed90a7991f2a3afc6a463e45acb03487ac (patch) | |
| tree | 85db6e546bb25cf94b19377f0953d1d2d02ee669 /builtin | |
| parent | 5c15ca0b3c866398f22cbab974d0a1964ef105ca (diff) | |
| parent | 95261974bbc8cc1a32ed260f06a694cde86f732d (diff) | |
| download | git-fdca2bed90a7991f2a3afc6a463e45acb03487ac.zip git-fdca2bed90a7991f2a3afc6a463e45acb03487ac.tar.gz git-fdca2bed90a7991f2a3afc6a463e45acb03487ac.tar.bz2 | |
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
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 295ce92..6cac59c 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 { |