Merge branch 'ml/maint-grep-doc' into maint

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

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index d9b9c34b3a60f09bea4f9e53b5127f33f356e042..f8df109d07240d4146ad37928147100f2d3a6bb2 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -55,8 +55,8 @@ other display programs (see below).
 +
 The web browser can be specified using the configuration variable
 'help.browser', or 'web.browser' if the former is not set. If none of
 +
 The web browser can be specified using the configuration variable
 'help.browser', or 'web.browser' if the former is not set. If none of

-these config variables is set, the 'git-web--browse' helper script
-(called by 'git-help') will pick a suitable default. See
+these config variables is set, the 'git web--browse' helper script
+(called by 'git help') will pick a suitable default. See

 linkgit:git-web--browse[1] for more information about this.
 
 CONFIGURATION VARIABLES
 linkgit:git-web--browse[1] for more information about this.
 
 CONFIGURATION VARIABLES


@@ -67,7 +67,7 @@ help.format
 
 If no command line option is passed, the 'help.format' configuration
 variable will be checked. The following values are supported for this
 
 If no command line option is passed, the 'help.format' configuration
 variable will be checked. The following values are supported for this

-variable; they make 'git-help' behave as their corresponding command
+variable; they make 'git help' behave as their corresponding command

 line option:
 
 * "man" corresponds to '-m|--man',
 line option:
 
 * "man" corresponds to '-m|--man',


@@ -122,7 +122,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