diff options
| author | Teddy Wing | 2020-08-04 02:56:11 +0200 |
|---|---|---|
| committer | Teddy Wing | 2020-08-04 02:56:11 +0200 |
| commit | 6a4abcf2d56d9f8e1cfef27bb6c5a3cfc88e1e26 (patch) | |
| tree | b88951f76b488235fdd7406f4fc9ff1c7b07845c | |
| parent | 1348559fd38f34f2723e33200c247f6b1d4f6f81 (diff) | |
| download | git-suggestion-6a4abcf2d56d9f8e1cfef27bb6c5a3cfc88e1e26.tar.bz2 | |
doc/git-sugpatch.1: Clarify precedence of configuration options
| -rw-r--r-- | doc/git-sugpatch.1 | 4 | ||||
| -rw-r--r-- | doc/git-sugpatch.1.txt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/git-sugpatch.1 b/doc/git-sugpatch.1 index f8a34b2..b930b20 100644 --- a/doc/git-sugpatch.1 +++ b/doc/git-sugpatch.1 @@ -66,11 +66,11 @@ Print the program version\&. .RE .SH "CONFIGURATION" .sp -Configuration options can be specified either as command line options, or in the Git config\&. +Configuration options can be specified either as command line options, or in the Git config\&. Command line options take precedence\&. .PP githubSuggestion\&.githubToken .RS 4 -A GitHub API token with the \(lqrepo\(rq permission\&. This can also be set with the +A GitHub API token with the \(lqrepo\(rq permission\&. This will override the \fBGITHUB_TOKEN\fR environment variable\&. .RE diff --git a/doc/git-sugpatch.1.txt b/doc/git-sugpatch.1.txt index d303559..54bf580 100644 --- a/doc/git-sugpatch.1.txt +++ b/doc/git-sugpatch.1.txt @@ -36,11 +36,11 @@ OPTIONS CONFIGURATION ------------- Configuration options can be specified either as command line options, -or in the Git config. +or in the Git config. Command line options take precedence. githubSuggestion.githubToken:: - A GitHub API token with the “repo” permission. This can also be set - with the `GITHUB_TOKEN` environment variable. + A GitHub API token with the “repo” permission. This will override + the `GITHUB_TOKEN` environment variable. githubSuggestion.remote:: The remote to use to fetch the suggestion from when passing a |