development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00: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
parent 5c15ca0b3c 95261974bb
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 @@ 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 {