Re: push.default: current vs upstream

From: Jeff King <peff@peff.net>
Date: Mar 30, 2012, 22:20 UTC
Message-ID: <20120330222044.GA22371@sigill.intra.peff.net>
In-Reply-To: <7vvcllka61.fsf@alter.siamese.dyndns.org>

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.

Show 9 quoted lines

> -   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 and push
> +   out only your current branch according to either "upstream" or "current"
> +   rule (we haven't yet decided which).

s/to and/to/

-Peff