From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philip Oakley Subject: [PATCH V3 5/5] Help doc: Include --guide option description Date: Tue, 2 Apr 2013 23:39:52 +0100 Message-ID: <1364942392-576-6-git-send-email-philipoakley@iee.org> References: <1364942392-576-1-git-send-email-philipoakley@iee.org> Cc: Junio C Hamano , "W. Trevor King" , David Aguilar To: GitList X-From: git-owner@vger.kernel.org Wed Apr 03 00:40:13 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UN9sC-0002tS-7A for gcvg-git-2@plane.gmane.org; Wed, 03 Apr 2013 00:40:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933468Ab3DBWjp (ORCPT ); Tue, 2 Apr 2013 18:39:45 -0400 Received: from out1.ip04ir2.opaltelecom.net ([62.24.128.240]:9647 "EHLO out1.ip04ir2.opaltelecom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933450Ab3DBWjo (ORCPT ); Tue, 2 Apr 2013 18:39:44 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmwJAMZcW1FOl3a6/2dsb2JhbABDgweCbb1UBAGBBBd0giABBVYjEAhJORABDQYTiBixa5ATjXyBHQeDQAOndoMMOw X-IronPort-AV: E=Sophos;i="4.87,396,1363132800"; d="scan'208";a="405411361" Received: from host-78-151-118-186.as13285.net (HELO localhost) ([78.151.118.186]) by out1.ip04ir2.opaltelecom.net with ESMTP; 02 Apr 2013 23:39:42 +0100 X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1364942392-576-1-git-send-email-philipoakley@iee.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Note that the ability to display an individual guide was always possible. Include this in the update. Also tell readers how git(1) can be accessed, especially for Git for Windows users who do not have the 'man' command. Likewise include a commentary on how to access this page (Catch 22). Signed-off-by: Philip Oakley --- Documentation/git-help.txt | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index e07b6dc..442d941 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -8,31 +8,45 @@ git-help - Display help information about Git SYNOPSIS -------- [verse] -'git help' [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND] +'git help' [-a|--all] [-g|--guide] + [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE] DESCRIPTION ----------- -With no options and no COMMAND given, the synopsis of the 'git' +With no options and no COMMAND or GUIDE given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output. -If the option '--all' or '-a' is given, then all available commands are +If the option '--all' or '-a' is given, all available commands are printed on the standard output. -If a Git subcommand is named, a manual page for that subcommand is brought -up. The 'man' program is used by default for this purpose, but this -can be overridden by other options or configuration variables. +If the option '--guide' or '-g' is given, a list of the useful +Git guides is also printed on the standard output. -Note that `git --help ...` is identical to `git help ...` because the +If a command, or a guide, is given, a manual page for that command or +guide is brought up. The 'man' program is used by default for this +purpose, but this can be overridden by other options or configuration +variables. + +Note that 'git --help ...' is identical to 'git help ...' because the former is internally converted into the latter. +To display the linkgit:git[1] man page, use 'git help git'. + +This page can be displayed with 'git help help' or 'git help --help' + OPTIONS ------- -a:: --all:: Prints all the available commands on the standard output. This - option supersedes any other option. + option overides any given command or guide name. + +-g:: +--guides:: + Prints a list of useful guides on the standard output. This + option overides any given command or guide name. -i:: --info:: -- 1.8.1.msysgit.1