[PATCH] fixup! push: switch default from "matching" to "simple"
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
This is to be squashed into jc/push-2.0-default-to-simple
(Noticed while writing the other patch about --force)
Documentation/git-push.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 9b9e7d1..81b875b 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -381,8 +381,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`
--
1.8.3.1.495.g13f33cf.dirty
Matthieu Moy <matthieu.moy@imag.fr>