diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:50 -0700 |
| commit | d1caa5895458443cc9535b6fda6ff8480383471b (patch) | |
| tree | c9e449b8416bc1a10887c36b2b4b9262cca12af1 /Documentation/config.txt | |
| parent | c24e0e7751c29b71376e32383f4f7ee2bc8e218d (diff) | |
| parent | d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff) | |
| download | git-d1caa5895458443cc9535b6fda6ff8480383471b.tar.gz | |
Merge branch 'jk/asciidoc-markup-fix'
Various documentation mark-up fixes to make the output more
consistent in general and also make AsciiDoctor (an alternative
formatter) happier.
* jk/asciidoc-markup-fix:
doc: convert AsciiDoc {?foo} to ifdef::foo[]
doc: put example URLs and emails inside literal backticks
doc: drop backslash quoting of some curly braces
doc: convert \--option to --option
doc/add: reformat `--edit` option
doc: fix length of underlined section-title
doc: fix hanging "+"-continuation
doc: fix unquoted use of "{type}"
doc: fix misrendering due to `single quote'
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index efea933561..54cbf6b7ea 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2292,18 +2292,18 @@ remote.<name>.skipFetchAll:: remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See - option \--receive-pack of linkgit:git-push[1]. + option --receive-pack of linkgit:git-push[1]. remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See - option \--upload-pack of linkgit:git-fetch-pack[1]. + option --upload-pack of linkgit:git-fetch-pack[1]. remote.<name>.tagOpt:: - Setting this value to \--no-tags disables automatic tag following when - fetching from remote <name>. Setting it to \--tags will fetch every + Setting this value to --no-tags disables automatic tag following when + fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to linkgit:git-fetch[1] can - override this setting. See options \--tags and \--no-tags of + override this setting. See options --tags and --no-tags of linkgit:git-fetch[1]. remote.<name>.vcs:: |