From 6a4abcf2d56d9f8e1cfef27bb6c5a3cfc88e1e26 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Tue, 4 Aug 2020 02:56:11 +0200 Subject: doc/git-sugpatch.1: Clarify precedence of configuration options --- doc/git-sugpatch.1 | 4 ++-- 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 -- cgit v1.2.3