summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-17 06:40:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-17 06:40:45 (GMT)
commit72cd63c008c673e185740a694cdf3e85711df3d2 (patch)
tree769aa7f5f340d15e71777eb6337bb711b2f5630e /git.c
parent7e5eb8f1834722507e2d2171a253b78b1d924458 (diff)
parentd3f69766c431bab6321fed1ce64d914dc44ff87f (diff)
downloadgit-72cd63c008c673e185740a694cdf3e85711df3d2.zip
git-72cd63c008c673e185740a694cdf3e85711df3d2.tar.gz
git-72cd63c008c673e185740a694cdf3e85711df3d2.tar.bz2
Merge branch 'maint'
* maint: Prepare 1.7.0.1 release notes Fix use of mutex in threaded grep dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught Remove hyphen from "git-command" in two error messages
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index b3e23f1..90c6daf 100644
--- a/git.c
+++ b/git.c
@@ -527,7 +527,7 @@ int main(int argc, const char **argv)
break;
if (was_alias) {
fprintf(stderr, "Expansion of alias '%s' failed; "
- "'%s' is not a git-command\n",
+ "'%s' is not a git command\n",
cmd, argv[0]);
exit(1);
}