From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:25:04 +0000 (-0800)
Subject: Merge branch 'jc/push-reject-reasons'
X-Git-Tag: v1.8.2-rc0~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/370855e967e21d9c5b70df7b5cd3756c7bed5c7c?hp=370855e967e21d9c5b70df7b5cd3756c7bed5c7c

Merge branch 'jc/push-reject-reasons'

Improve error and advice messages given locally when "git push"
refuses when it cannot compute fast-forwardness by separating these
cases from the normal "not a fast-forward; merge first and push
again" case.

* jc/push-reject-reasons:
push: finishing touches to explain REJECT_ALREADY_EXISTS better
push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
push: further simplify the logic to assign rejection reason
push: further clean up fields of "struct ref"
---