Re: [fixup PATCH] push: Provide situational hints for non-fast-forward errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Christopher Tiwald <christiwald@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]