summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-10 19:13:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-10 19:13:44 (GMT)
commitd4e7b9bcb0ca9ef976b765b0daf29b4c1466db48 (patch)
treec8837968f27013f1988c08c5bfebb654c9e4174e /Documentation/git-push.txt
parentb7a6ec609ff10652541e7f716fcecf7865b94b23 (diff)
parentf6b1fb372ee164e4cb2d15a9a325e13685f9dc2d (diff)
downloadgit-d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48.zip
git-d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48.tar.gz
git-d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48.tar.bz2
Merge branch 'mm/push-simple-doc' into maint
The documentation did not clearly state that the 'simple' mode is now the default for "git push" when push.default configuration is not set. * mm/push-simple-doc: Documentation/git-push: document that 'simple' is the default
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 4c775bc..af521f8 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -37,6 +37,13 @@ the default `<refspec>` by consulting `remote.*.push` configuration,
and if it is not found, honors `push.default` configuration to decide
what to push (See linkgit:git-config[1] for the meaning of `push.default`).
+When neither the command-line nor the configuration specify what to
+push, the default behavior is used, which corresponds to the `simple`
+value for `push.default`: the current branch is pushed to the
+corresponding upstream branch, but as a safety measure, the push is
+aborted if the upstream branch does not have the same name as the
+local one.
+
OPTIONS[[OPTIONS]]
------------------