diff options
author | Jeff King <peff@peff.net> | 2012-06-07 23:03:23 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-08 08:31:52 -0700 |
commit | fe77b416c774a469a585c4b58fcae5e7a5f3545d (patch) | |
tree | 061ebc63f37f82f7852733fc311333dc7c2c789f /Documentation/technical/api-merge.txt | |
parent | 04ab6ae7765700375e9442347430fc3a6de40f81 (diff) | |
download | git-fe77b416c774a469a585c4b58fcae5e7a5f3545d.tar.gz |
docs: fix cross-directory linkgit references
Most of our documentation is in a single directory, so using
linkgit:git-config[1] just generates a relative link in the
same directory. However, this is not the case with the API
documentation in technical/*, which need to refer to
git-config from the parent directory.
We can fix this by passing a special prefix attribute when building
in a subdirectory, and respecting that prefix in our linkgit
definitions.
We only have to modify the html linkgit definition. For
manpages, we can ignore this for two reasons:
1. we do not generate actual links to the file in
manpages, but instead just give the name and section of
the linked manpage
2. we do not currently build manpages for subdirectories,
only html
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-merge.txt')
-rw-r--r-- | Documentation/technical/api-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |