commit ce432cac30f98b291be609a0fc974042a2156f55
author Junio C Hamano <gitster@pobox.com> Mon Mar 11 13:00:16 2013 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Mar 11 13:00:16 2013 -0700
tree 74b39215d268b28254a0002de1813686d542be62
parent f1eba9f055f59ea7a04b4bb45facc1c64abc2132
parent 03a0fb0ccf48c831060c2243f830b6a12cd8fdf3

Merge branch 'maint'

* maint:
  git.c: make usage match manual page

git.c

diff --git a/git.c b/git.c
index 86c4432..39ba6b1 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[] =