Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mk/blame-error-message' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Nov 2015 23:32:42 +0000
(15:32 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Nov 2015 23:32:43 +0000
(15:32 -0800)
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".
* mk/blame-error-message:
blame: fix option name in error message
builtin/blame.c
patch
|
blob
|
history
raw
(from parent 1:
5c15ca0
)
diff --git
a/builtin/blame.c
b/builtin/blame.c
index 295ce92da5df25a9082b868e848ee9634145e636..6cac59c973bfcf1dc48e2a1af26375f914bb02c4 100644
(file)
--- a/
builtin/blame.c
+++ b/
builtin/blame.c
@@
-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 {