summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:21 (GMT)
commit1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881 (patch)
tree9e67ad97cdf84b3ffaf501f3bf62ed040cacb522 /Documentation/git-push.txt
parent2a24444aaeaabd8559751b02015c025157604f38 (diff)
parentf6b1fb372ee164e4cb2d15a9a325e13685f9dc2d (diff)
downloadgit-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.zip
git-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.tar.gz
git-1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881.tar.bz2
Merge branch 'mm/push-simple-doc'
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 669a357..cf6ee4a 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]]
------------------