From: Junio C Hamano Date: Thu, 10 Mar 2016 19:13:44 +0000 (-0800) Subject: Merge branch 'mm/push-simple-doc' into maint X-Git-Tag: v2.7.3~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48?hp=b7a6ec609ff10652541e7f716fcecf7865b94b23 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 --- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 4c775bcec4..af521f8990 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -37,6 +37,13 @@ the default `` 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]] ------------------