Merge branch 'tb/push-simple-uses-branch-merge-config'

gitster · gitster · commit c6617d1e4f46 · 2021-03-24T14:36:27.000-07:00
Doc update.

* tb/push-simple-uses-branch-merge-config:
  Documentation/git-push.txt: correct configuration typo
diff --git 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.
 +

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ EXAMPLES`
`600`	`600`
`601`	`601`	`git push origin`::
`602`	`602`	`Without additional configuration, pushes the current branch to`
`603`		- the configured upstream (`remote.origin.merge` configuration
	`603`	+ the configured upstream (`branch.<name>.merge` configuration
`604`	`604`	`variable) if it has the same name as the current branch, and`
`605`	`605`	`errors out without pushing otherwise.`
`606`	`606`	`+`