diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-24 15:19:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-24 15:19:22 -0700 |
| commit | 4d119a12679a6e377323473c71ba298a648578e4 (patch) | |
| tree | ec064da12d0a9f43b313676af46aae1f1fdf1b0a /git-push.html | |
| parent | 458281a5cc4fbbf5382b507870ac92d09f4cb1d9 (diff) | |
| download | git-htmldocs-4d119a12679a6e377323473c71ba298a648578e4.tar.gz | |
Autogenerated HTML docs for v2.31.0-121-g9198c
Diffstat (limited to 'git-push.html')
| -rw-r--r-- | git-push.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-push.html b/git-push.html index 9a6904a8e..3b375790d 100644 --- a/git-push.html +++ b/git-push.html @@ -1793,7 +1793,7 @@ a case where you do mean to lose history.</p></div> <dd>
<p>
Without additional configuration, pushes the current branch to
- the configured upstream (<code>remote.origin.merge</code> configuration
+ the configured upstream (<code>branch.<name>.merge</code> configuration
variable) if it has the same name as the current branch, and
errors out without pushing otherwise.
</p>
@@ -1971,7 +1971,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-27 15:58:27 PDT
+ 2021-03-24 15:15:46 PDT
</div>
</div>
</body>
|