Fix passwd(5) ref and reflect that commit doens't use commit-tree

[git.git] / Documentation / git-help.txt

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index bfbba9e235495b0a7e31b4d3ed558bef105ad02d..f414583fc48e85e4785fbf5f9431bb81a96ccd9d 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -23,20 +23,23 @@ If a git command is named, a manual page for that command is brought
 up. The 'man' program is used by default for this purpose, but this
 can be overridden by other options or configuration variables.
 
 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 as 'git help ...' because the
+Note that `git --help ...` is identical to `git help ...` because the

 former is internally converted into the latter.
 
 OPTIONS
 -------
 former is internally converted into the latter.
 
 OPTIONS
 -------

--a|--all::
+-a::
+--all::

        Prints all the available commands on the standard output. This
        option supersedes any other option.
 
        Prints all the available commands on the standard output. This
        option supersedes any other option.
 

--i|--info::
+-i::
+--info::

        Display manual page for the command in the 'info' format. The
        'info' program will be used for that purpose.
 
        Display manual page for the command in the 'info' format. The
        'info' program will be used for that purpose.
 

--m|--man::
+-m::
+--man::

        Display manual page for the command in the 'man' format. This
        option may be used to override a value set in the
        'help.format' configuration variable.
        Display manual page for the command in the 'man' format. This
        option may be used to override a value set in the
        'help.format' configuration variable.


@@ -45,7 +48,8 @@ By default the 'man' program will be used to display the manual page,
 but the 'man.viewer' configuration variable may be used to choose
 other display programs (see below).
 
 but the 'man.viewer' configuration variable may be used to choose
 other display programs (see below).
 

--w|--web::
+-w::
+--web::

        Display manual page for the command in the 'web' (HTML)
        format. A web browser will be used for that purpose.
 +
        Display manual page for the command in the 'web' (HTML)
        format. A web browser will be used for that purpose.
 +


@@ -116,7 +120,7 @@ man.<tool>.path
 You can explicitly provide a full path to your preferred man viewer by
 setting the configuration variable 'man.<tool>.path'. For example, you
 can configure the absolute path to konqueror by setting
 You can explicitly provide a full path to your preferred man viewer by
 setting the configuration variable 'man.<tool>.path'. For example, you
 can configure the absolute path to konqueror by setting

-'man.konqueror.path'. Otherwise, 'git help' assumes the tool is
+'man.konqueror.path'. Otherwise, 'git-help' assumes the tool is

 available in PATH.
 
 man.<tool>.cmd
 available in PATH.
 
 man.<tool>.cmd


@@ -172,10 +176,10 @@ Written by Junio C Hamano <gitster@pobox.com> and the git-list
 
 Documentation
 -------------
 
 Documentation
 -------------

-Initial documentation was part of the linkgit:git[7] man page.
+Initial documentation was part of the linkgit:git[1] man page.

 Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
 little. Maintenance is done by the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
 little. Maintenance is done by the git-list <git@vger.kernel.org>.
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite