diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-04 23:30:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-05 00:46:53 +0400 |
| commit | dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4 (patch) | |
| tree | f772a1aefc353c1023ba8749502c1e5f75d3bb37 /Documentation | |
| parent | 121f71f0da1bc9a4e1e96be2c3e683191a82a354 (diff) | |
doc: fix xref link from api docs to manual pages
They are one-level above, so refer them as linkgit:../git-foo[n] with "../"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/api-config.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-merge.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt index edf8dfb99b..bd4d8b8f4f 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-merge.txt b/Documentation/technical/api-merge.txt index 9dc1bed768..25158b8dc8 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 |