diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-24 14:36:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-24 14:36:27 -0700 |
| commit | c6617d1e4f462405e6e237a21026c1cf3b557ec0 (patch) | |
| tree | faa84a38ceef6a6fbc8fa711ca872c369e827109 /Documentation | |
| parent | The second batch (diff) | |
| parent | Documentation/git-push.txt: correct configuration typo (diff) | |
| download | tgif-c6617d1e4f462405e6e237a21026c1cf3b557ec0.tar.xz | |
Merge branch 'tb/push-simple-uses-branch-merge-config'
Doc update.
* tb/push-simple-uses-branch-merge-config:
Documentation/git-push.txt: correct configuration typo
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-push.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index ab103c82cf..a953c7c387 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. + |