summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2021-03-08 18:43:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-13 23:41:45 (GMT)
commit4c8e3dca6eab37c8149160d54a845439d33ce391 (patch)
tree4582e77dbb4989cfc27f90d99d662a1648b6033e /Documentation/git-push.txt
parent59ec22464f6c2b170b05f287e00740ea2288fe5c (diff)
downloadgit-4c8e3dca6eab37c8149160d54a845439d33ce391.zip
git-4c8e3dca6eab37c8149160d54a845439d33ce391.tar.gz
git-4c8e3dca6eab37c8149160d54a845439d33ce391.tar.bz2
Documentation/git-push.txt: correct configuration typo
In the EXAMPLES section, git-push(1) says that 'git push origin' pushes the current branch to the value of the 'remote.origin.merge' configuration. This wording (which dates back to b2ed944af7 (push: switch default from "matching" to "simple", 2013-01-04)) is incorrect. There is no such configuration as 'remote.<name>.merge'. This likely was originally intended to read "branch.<name>.merge" instead. Indeed, when 'push.default' is 'simple' (which is the default value, and is applicable in this scenario per "without additional configuration"), setup_push_upstream() dies if the branch's local name does not match 'branch.<name>.merge'. Correct this long-standing typo to resolve some recent confusion on the intended behavior of this example. Reported-by: Adam Sharafeddine <adam.shrfdn@gmail.com> Reported-by: Fabien Terrani <terranifabien@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index ab103c8..a953c7c 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/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.
+