summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:36 -0800
commit4cf7f48891d36d9ec3783119ddc1177fa9f0581e (patch)
tree420dcaa655df8548f51ae8cc9fd64729ea448109
parentMerge branch 'jk/clang-sanitizer-fixes' (diff)
parentdoc: drop "explicitly given" from push.default description (diff)
downloadtgif-4cf7f48891d36d9ec3783119ddc1177fa9f0581e.tar.xz
Merge branch 'jk/push-default-doc'
Doc update. * jk/push-default-doc: doc: drop "explicitly given" from push.default description
-rw-r--r--Documentation/config/push.txt5
1 files 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,6 +1,7 @@
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:
@@ -8,7 +9,7 @@ push.default::
--
* `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