doc/git-config: simplify "override" advice for FILES section
At the end of the FILES section, we indicate that you can override the regular lookup rules with --global, etc. But: - we're missing the --local option - we point to GIT_CONFIG instead of --file, but the latter has much better documentation - we're vague about how the overrides work; the actual option descriptions are much better here So let's just mention the names and point people back to the OPTIONS section. We could perhaps even delete this paragraph entirely, but the presence of the names may give people reading FILES a clue about where to look for more information. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 14, 2021 at 17:38 UTC
734283855f86bab97a060278538d5c68ca5edbc7
1 file changed
+4
-5
Documentation/git-config.txt
+4
-5
@@ -71,6 +71,7 @@ codes are:
71
72
On success, the command returns the exit code 0.
73
74
+[[OPTIONS]]
75
OPTIONS
76
-------
77
@@ -331,11 +332,9 @@ All writing options will per default write to the repository specific
332
configuration file. Note that this also affects options like `--replace-all`
333
and `--unset`. *'git config' will only ever change one file at a time*.
334
334
-You can override these rules either by command-line options or by environment
335
-variables. The `--global`, `--system` and `--worktree` options will limit
336
-the file used to the global, system-wide or per-worktree file respectively.
337
-The `GIT_CONFIG` environment variable has a similar effect, but you
338
-can specify any filename you want.
335
+You can override these rules using the `--global`, `--system`,
336
+`--local`, `--worktree`, and `--file` command-line options; see
337
+<<OPTIONS>> above.
338
339
340
ENVIRONMENT