From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Mar 2022 21:38:24 +0000 (-0800)
Subject: Merge branch 'ab/help-fixes'
X-Git-Tag: v2.36.0-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f3c5f39e0582b9538106a7da38a5af89e5785a4;p=thirdparty%2Fgit.git

Merge branch 'ab/help-fixes'

Updates to how command line options to "git help" are handled.

* ab/help-fixes:
  help: don't print "\n" before single-section output
  help: add --no-[external-commands|aliases] for use with --all
  help: error if [-a|-g|-c] and [-i|-m|-w] are combined
  help: correct usage & behavior of "git help --all"
  help: note the option name on option incompatibility
  help.c: split up list_all_cmds_help() function
  help tests: test "git" and "git help [-a|-g] spacing
  help.c: use puts() instead of printf{,_ln}() for consistency
  help doc: add missing "]" to "[-a|--all]"
---

1f3c5f39e0582b9538106a7da38a5af89e5785a4
diff --cc builtin/help.c
index b4f2ad3f94,01eda326c3..222f994f86
--- a/builtin/help.c
+++ b/builtin/help.c
@@@ -75,10 -80,10 +80,10 @@@ static struct option builtin_help_optio
  };
  
  static const char * const builtin_help_usage[] = {
- 	N_("git help [-a|--all] [--[no-]verbose]]\n"
- 	   "         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
 -	N_("git help [-a|--all] [--[no-]verbose]] [--[no-]external-commands] [--[no-]aliases]"),
++	"git help [-a|--all] [--[no-]verbose]] [--[no-]external-commands] [--[no-]aliases]",
+ 	N_("git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
 -	N_("git help [-g|--guides]"),
 -	N_("git help [-c|--config]"),
 +	"git help [-g|--guides]",
 +	"git help [-c|--config]",
  	NULL
  };