Merge branch 'maint'

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

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index bfbba9e235495b0a7e31b4d3ed558bef105ad02d..faecd6bb907b9622aa0a6a3a9fab2665c867354e 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -28,15 +28,18 @@ former is internally converted into the latter.
 
 OPTIONS
 -------
 
 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.
 +


@@ -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