Re: [PATCH] doc: clarify "explicitly given" in push.default
- From
Jeff King <peff@peff.net>
- Date
- Jan 29, 2020, 05:53 UTC
- Message-ID
- <20200129055355.GB611490@coredump.intra.peff.net>
- In-Reply-To
- <xmqq7e1a7s83.fsf@gitster-ct.c.googlers.com>
On Tue, Jan 28, 2020 at 09:21:32PM -0800, Junio C Hamano wrote:
Show 12 quoted lines
> Jeff King <peff@peff.net> writes: > > > Though I'd still slightly worry that somebody might not consider > > configured refspecs. Saying more clearly "any refspec no matter where it > > comes from" might still be worthwhile. I.e., something like: > > > > Defines the action `git push` should take if no refspec is given > > (whether from the command-line, config, or elsewhere). > > That's 100x better than to say "explicit" "implicit" etc. and then > have readers guess what the adjectives mean or explain what they > mean in (parentheses).
OK, here it is in patch form, then, so we can (hopefully) wrap this up.
-- >8 -- Subject: [PATCH] doc: drop "explicitly given" from push.default description
The documentation for push.default mentions that it is used if no refspec is "explicitly given". Let's drop the notion of "explicit" here, since it's vague, and just mention that any refspec from anywhere is sufficient to override this.
I've dropped the mention of "explicitly given" frmo the definition of the "nothing" value right below, too. It's close enough to our clarification that it should be obvious we mean the same type of "given" here.
Signed-off-by: Jeff King <peff@peff.net> --- Note that there's one other use of the word "explicit" in the context, but it is used appropriately. :)
Documentation/config/push.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt index 0a0e000569..54871f8213 100644 --- a/Documentation/config/push.txt +++ b/Documentation/config/push.txt @@ -1,14 +1,15 @@ push.default:: Defines the action `git push` should take if no refspec is - explicitly given. Different values are well-suited for + given (whether from the command-line, config, or elsewhere). + Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are: + -- * `nothing` - do not push anything (error out) unless a refspec is - explicitly given. This is primarily meant for people who want to + given. This is primarily meant for people who want to avoid mistakes by always being explicit. * `current` - push the current branch to update a branch with the same
-- 2.25.0.515.g69a699b7aa