diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-12 08:52:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-12 08:52:18 +0400 |
| commit | 7baf32a829e6e253f8b3b683da470be36b54c377 (patch) | |
| tree | 61d90f9c79285ec276cc4478c148395ca7c7ed6d /Documentation/config.txt | |
| parent | 3fc44a10f62fdca29558dc553a3e12949af30637 (diff) | |
| parent | 27269fc5f2781cd8f6e832043f9abf7305aa3d49 (diff) | |
Merge branch 'jn/doc-dashdash' into maint
* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc
Conflicts:
Documentation/git-mergetool--lib.txt
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4914d768c7..ae9913b034 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -678,7 +678,7 @@ branch.<name>.rebase:: browser.<tool>.cmd:: Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed - as arguments. (See linkgit:git-web--browse[1].) + as arguments. (See linkgit:git-web{litdd}browse[1].) browser.<tool>.path:: Override the path for the given tool that may be used to |