diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:42 -0700 |
| commit | 7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6 (patch) | |
| tree | 7b77d403201c495a69ffb2123d64fcea03f2e05c /Documentation/git-help.txt | |
| parent | b9f171cc3b3f7f528acf672b5fef7e95b153213b (diff) | |
| parent | 2839478774f48074d7d87b8a9838827742a5b058 (diff) | |
| download | git-7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6.tar.gz git-7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6.tar.xz | |
Merge branch 'jc/maint-doc-em-dash'
* jc/maint-doc-em-dash:
Work around em-dash handling in newer AsciiDoc
Diffstat (limited to 'Documentation/git-help.txt')
| -rw-r--r-- | Documentation/git-help.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index f8df109d0..eccd0ffd3 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -55,9 +55,9 @@ 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 -these config variables is set, the 'git web--browse' helper script +these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See -linkgit:git-web--browse[1] for more information about this. +linkgit:git-web{litdd}browse[1] for more information about this. CONFIGURATION VARIABLES ----------------------- @@ -80,7 +80,7 @@ help.browser, web.browser and browser.<tool>.path The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also be checked if the 'web' format is chosen (either by command line option or configuration variable). See '-w|--web' in the OPTIONS -section above and linkgit:git-web--browse[1]. +section above and linkgit:git-web{litdd}browse[1]. man.viewer ~~~~~~~~~~ |