mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mk/blame-error-message'

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-10-30 13:07:01 -07:00
parent 808d119263 95261974bb
commit 23d58a00e5
1 changed files with 1 additions and 1 deletions
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; sb.commits.compare = compare_commits_by_commit_date;
} }
else if (contents_from) 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) else if (revs.first_parent_only)
die("combining --first-parent and --reverse is not supported"); die("combining --first-parent and --reverse is not supported");
else { else {