summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-11 13:00:16 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-11 13:00:16 -0700
commitce432cac30f98b291be609a0fc974042a2156f55 (patch)
tree74b39215d268b28254a0002de1813686d542be62 /git.c
parentf1eba9f055f59ea7a04b4bb45facc1c64abc2132 (diff)
parent03a0fb0ccf48c831060c2243f830b6a12cd8fdf3 (diff)
downloadgit-ce432cac30f98b291be609a0fc974042a2156f55.tar.gz
Merge branch 'maint'
* maint: git.c: make usage match manual page
Diffstat (limited to 'git.c')
-rw-r--r--git.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/git.c b/git.c
index 86c4432db5..39ba6b1461 100644
--- a/git.c
+++ b/git.c
@@ -6,10 +6,10 @@
#include "run-command.h"
const char git_usage_string[] =
- "git [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+ "git [--version] [--help] [-c name=value]\n"
+ " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
- " [-c name=value] [--help]\n"
" <command> [<args>]";
const char git_more_info_string[] =