diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-08 08:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-08 08:32:20 -0700 |
| commit | 02101c969dba9de4200cdd0cc8d88ce665b2c474 (patch) | |
| tree | 4c975c5f5945564eae86d1e933192c4a9096bfe5 /Documentation/technical | |
| parent | a1a031d9356cc89cadc5e14acc4028e3ecc306eb (diff) | |
| parent | fe77b416c774a469a585c4b58fcae5e7a5f3545d (diff) | |
| download | git-02101c969dba9de4200cdd0cc8d88ce665b2c474.tar.gz | |
Merge branch 'mm/api-credentials-doc'
Finishing touches...
* mm/api-credentials-doc:
docs: fix cross-directory linkgit references
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-config.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-credentials.txt | 6 | ||||
| -rw-r--r-- | Documentation/technical/api-merge.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt index bd4d8b8f4f..edf8dfb99b 100644 --- a/Documentation/technical/api-config.txt +++ b/Documentation/technical/api-config.txt @@ -2,7 +2,7 @@ config API ========== The config API gives callers a way to access git configuration files -(and files which have the same syntax). See linkgit:../git-config[1] for a +(and files which have the same syntax). See linkgit:git-config[1] for a discussion of the config file syntax. General Usage diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index 199307ca0a..4ef1db39ab 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -180,7 +180,7 @@ longer than a single git process; e.g., credentials may be stored in-memory for a few minutes, or indefinitely on disk). Each helper is specified by a single string in the configuration -variable `credential.helper` (and others, see linkgit:../git-config[1]). +variable `credential.helper` (and others, see linkgit:git-config[1]). The string is transformed by git into a command to be executed using these rules: @@ -293,6 +293,6 @@ helpers will just ignore the new requests). See also -------- -linkgit:../gitcredentials[7] +linkgit:gitcredentials[7] -linkgit:../git-config[5] (See configuration variables `credential.*`) +linkgit:git-config[5] (See configuration variables `credential.*`) diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt index 25158b8dc8..9dc1bed768 100644 --- a/Documentation/technical/api-merge.txt +++ b/Documentation/technical/api-merge.txt @@ -36,7 +36,7 @@ the operation of a low-level (single file) merge. Some options: ancestors in a recursive merge. If a helper program is specified by the `[merge "<driver>"] recursive` configuration, it will - be used (see linkgit:../gitattributes[5]). + be used (see linkgit:gitattributes[5]). `variant`:: Resolve local conflicts automatically in favor |