diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:44 -0800 |
| commit | d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48 (patch) | |
| tree | c8837968f27013f1988c08c5bfebb654c9e4174e /Documentation | |
| parent | Merge branch 'jk/tighten-alloc' into maint (diff) | |
| parent | Documentation/git-push: document that 'simple' is the default (diff) | |
| download | tgif-d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-push.txt | 7 |
1 files changed, 7 insertions, 0 deletions
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 `<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]] ------------------ |