From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Mar 2012 00:15:09 GMT
Subject: Re: [fixup PATCH] push: Provide situational hints for non-fast-forward errors
Message-ID: <7v7gyhcupe.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120317184649.GA320@gmail.com>

Christopher Tiwald <christiwald@gmail.com> writes:

> I prefer the "Some of your local..." language to "Updates were
> rejected..." as a reader, but I think you're right about providing the
> reason git rejected the push up front.

Ok.

> My concern about this particular message is "tip of your branch is behind
> the remote" reads to me like my _current_ branch is the offender, when
> that cannot be the case (it'd hit message_advice_pull_before_push
> first). Maybe something like this might make it clearer?
>
> "Updates were rejected because a pushed branch tip is behind its remote
> counterpart. If you did not intend to push that branch, you may want to
> explicitly specify branches to push or set the 'push.default' configuration
> variable to 'current' or 'upstream' to always push only the current branch."

Sounds good.