summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2016-02-23 21:04:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-23 21:35:10 (GMT)
commitf6b1fb372ee164e4cb2d15a9a325e13685f9dc2d (patch)
tree6d269cbc6decfe347d544aa75fdadd8b6008c149 /Documentation/git-push.txt
parenta2558fb8e1e387b630312311e1d22c95663da5d0 (diff)
downloadgit-f6b1fb372ee164e4cb2d15a9a325e13685f9dc2d.zip
git-f6b1fb372ee164e4cb2d15a9a325e13685f9dc2d.tar.gz
git-f6b1fb372ee164e4cb2d15a9a325e13685f9dc2d.tar.bz2
Documentation/git-push: document that 'simple' is the default
The default behavior is well documented already in git-config(1), but git-push(1) itself did not mention it at all. For users willing to learn how "git push" works but not how to configure it, this makes the documentation cumbersome to read. Make the git-push(1) page self-contained by adding a short summary of what 'push.default=simple' does, early in the page. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 135d810..d8c30a9 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -36,6 +36,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]]
------------------