aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 15:13:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-03-07 15:13:15 -0800
commit009055f3ecd8d9b4eb140429cb5ce5d2088174c7 (patch)
tree20b94ea336a2cd7435a937b253f9527761e062cb /Documentation/git-push.txt
parent6ab4ae2b415c375170309c2b7ace0e4daa8d0215 (diff)
parentb2ed944af79041b4da151a432064c3b1c1b82fc5 (diff)
downloadgit-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.tar.gz
Merge branch 'jc/push-2.0-default-to-simple'
Finally update the "git push" default behaviour to "simple".
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 2b7f4f939f..14862fb203 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -83,8 +83,8 @@ the local side, the remote side is updated if a branch of the same name
already exists on the remote side.
--all::
- Instead of naming each ref to push, specifies that all
- refs under `refs/heads/` be pushed.
+ Push all branches (i.e. refs under `refs/heads/`); cannot be
+ used with other <refspec>.
--prune::
Remove remote branches that don't have a local counterpart. For example
@@ -442,8 +442,10 @@ Examples
configured for the current branch).
`git push origin`::
- Without additional configuration, works like
- `git push origin :`.
+ Without additional configuration, pushes the current branch to
+ the configured upstream (`remote.origin.merge` configuration
+ variable) if it has the same name as the current branch, and
+ errors out without pushing otherwise.
+
The default behavior of this command when no <refspec> is given can be
configured by setting the `push` option of the remote, or the `push.default`