Merge branch 'maint'

diff --git a/daemon.c b/daemon.c
index ce3a6f58f3c5c6bb88617510422c4053e0d545a2..7df41a6a49359f31991d383f73b8d9cb11e992a9 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -18,7 +18,7 @@ static int verbose;
 static int reuseaddr;
 
 static const char daemon_usage[] =
-"git-daemon [--verbose] [--syslog] [--export-all]\n"
+"git daemon [--verbose] [--syslog] [--export-all]\n"
 "           [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
 "           [--base-path=path] [--base-path-relaxed]\n"
 "           [--user-path | --user-path=path]\n"