From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Mar 2013 19:40:13 +0000 (-0700)
Subject: Merge branch 'jc/maint-push-refspec-default-doc' into maint
X-Git-Tag: v1.8.2.1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4bdb255f672d953ab6150c80af9db32e6dbe6bb;p=git

Merge branch 'jc/maint-push-refspec-default-doc' into maint

* jc/maint-push-refspec-default-doc:
  Documentation/git-push: clarify the description of defaults
---

f4bdb255f672d953ab6150c80af9db32e6dbe6bb
diff --cc Documentation/git-push.txt
index 13980257ee,3b41e72f88..577d201c00
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -64,12 -71,9 +72,9 @@@ Pushing an empty <src> allows you to de
  the remote repository.
  +
  The special refspec `:` (or `+:` to allow non-fast-forward updates)
 -directs git to push "matching" branches: for every branch that exists on
 +directs Git to push "matching" branches: for every branch that exists on
  the local side, the remote side is updated if a branch of the same name
- already exists on the remote side.  This is the default operation mode
- if no explicit refspec is found (that is neither on the command line
- nor in any Push line of the corresponding remotes file---see below) and
- no `push.default` configuration variable is set.
+ already exists on the remote side.
  
  --all::
  	Instead of naming each ref to push, specifies that all