summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-16 23:05:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-16 23:05:02 (GMT)
commite7b3cea0f7589c57f7bb808330e32bdd7f901c95 (patch)
treef5612fd7df20b7d7273ddf44b30117e6eb1764a9 /git.c
parentb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd (diff)
parenteb0bcd0fbe34befe7648a398efc7f4156b07da48 (diff)
downloadgit-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.zip
git-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.gz
git-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.bz2
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: 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 4c3028c..c445d7b 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);
}