Merge fixes up to GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/git.c b/git.c
index e795ddb810..5e7da74b68 100644
--- a/git.c
+++ b/git.c
@@ -244,6 +244,11 @@ int main(int argc, char **argv, char **envp)
 	for (i = 1; i < argc; i++) {
 		char *arg = argv[i];
 
+		if (!strcmp(arg, "help")) {
+			show_help = 1;
+			continue;
+		}
+
 		if (strncmp(arg, "--", 2))
 			break;