mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mk/blame-error-message' into maint

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

* mk/blame-error-message:
  blame: fix option name in error message
This commit is contained in:
Junio C Hamano 2015-11-03 15:32:42 -08:00
commit fdca2bed90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/blame.c
View File

@ -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 {