Re: push.default: current vs upstream

[Junio C Hamano <gitster@pobox.com>]

Jeff King <peff@peff.net> writes:

> On Fri, Mar 30, 2012 at 03:15:34PM -0700, Junio C Hamano wrote:
>
>> In the meantime, we can do this.
>
> I'm OK with this. We could perhaps even invite people to take part in
> the discussion. I'm not sure if that will generate anything more than a
> set of "me too" votes, though.

Yeah, but at that point, people who pushed against "matching" will help
us, instead of letting us hang dry.

I really hated that 1.6.0 transition, where noisy vocal ones disappeared
once they got what they wanted without defending the choice they forced on
us.

 Documentation/RelNotes/1.7.10.txt |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index d326ff8..5d72446 100644
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -32,12 +32,12 @@ Compatibility Notes
  * When you do not tell which branches and tags to push to the "git push"
    command in any way, the command used "matching refs" rule to update
    remote branches and tags with branches and tags with the same name you
-   locally have.  In future versions of Git, this will change to use the
-   "upstream" rule to update the branch at the remote you would "pull"
-   from into your current branch with your local current branch.  The
-   release after 1.7.10 will start issuing a warning about this change,
-   to encourage you to tell the command what to push out, e.g. by setting
-   push.default configuration.
+   locally have.  In future versions of Git, this will change to push out
+   only your current branch according to either the "upstream" or the
+   "current" rule.  Although "upstream" may be more powerful once the
+   user understands Git better, the semantics "current" gives is
+   simpler and easier to understand for beginners and may be a safer
+   and better default option, but we haven't decided yet.
 
 
 Updates since v1.7.9