From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2013 20:00:16 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ce432cac30f98b291be609a0fc974042a2156f55?ds=inline;hp=-c

Merge branch 'maint'

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

ce432cac30f98b291be609a0fc974042a2156f55
diff --combined git.c
index 86c4432db5,c598dc6367..39ba6b1461
--- a/git.c
+++ b/git.c
@@@ -6,10 -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[] =
@@@ -135,14 -135,6 +135,14 @@@ static int handle_options(const char **
  			git_config_push_parameter((*argv)[1]);
  			(*argv)++;
  			(*argc)--;
 +		} else if (!strcmp(cmd, "--literal-pathspecs")) {
 +			setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "1", 1);
 +			if (envchanged)
 +				*envchanged = 1;
 +		} else if (!strcmp(cmd, "--no-literal-pathspecs")) {
 +			setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "0", 1);
 +			if (envchanged)
 +				*envchanged = 1;
  		} else {
  			fprintf(stderr, "Unknown option: %s\n", cmd);
  			usage(git_usage_string);
@@@ -313,7 -305,6 +313,7 @@@ static void handle_internal_command(in
  		{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "check-attr", cmd_check_attr, RUN_SETUP },
 +		{ "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE },
  		{ "check-ref-format", cmd_check_ref_format },
  		{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
  		{ "checkout-index", cmd_checkout_index,