File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ config API
2
2
==========
3
3
4
4
The config API gives callers a way to access git configuration files
5
- (and files which have the same syntax). See linkgit:git-config[1] for a
5
+ (and files which have the same syntax). See linkgit:../ git-config[1] for a
6
6
discussion of the config file syntax.
7
7
8
8
General Usage
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ the operation of a low-level (single file) merge. Some options:
36
36
ancestors in a recursive merge.
37
37
If a helper program is specified by the
38
38
`[merge "<driver>"] recursive` configuration, it will
39
- be used (see linkgit:gitattributes[5]).
39
+ be used (see linkgit:../ gitattributes[5]).
40
40
41
41
`variant`::
42
42
Resolve local conflicts automatically in favor
You can’t perform that action at this time.
0 commit comments