summaryrefslogtreecommitdiffstats
path: root/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-24 15:19:22 -0700
committerJunio C Hamano <gitster@pobox.com>2021-03-24 15:19:22 -0700
commit4d119a12679a6e377323473c71ba298a648578e4 (patch)
treeec064da12d0a9f43b313676af46aae1f1fdf1b0a /git-push.txt
parent458281a5cc4fbbf5382b507870ac92d09f4cb1d9 (diff)
downloadgit-htmldocs-4d119a12679a6e377323473c71ba298a648578e4.tar.gz
Autogenerated HTML docs for v2.31.0-121-g9198c
Diffstat (limited to 'git-push.txt')
-rw-r--r--git-push.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-push.txt b/git-push.txt
index ab103c82c..a953c7c38 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -600,7 +600,7 @@ EXAMPLES
`git push origin`::
Without additional configuration, pushes the current branch to
- the configured upstream (`remote.origin.merge` configuration
+ the configured upstream (`branch.<name>.merge` configuration
variable) if it has the same name as the current branch, and
errors out without pushing otherwise.
+