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-Url: http://git.tremily.us/?a=commitdiff_plain;h=370855e967e21d9c5b70df7b5cd3756c7bed5c7c;p=git.git

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"
---

370855e967e21d9c5b70df7b5cd3756c7bed5c7c
diff --cc Documentation/config.txt
index 10225cfaf,1f47761c8..c8abe86ed
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -162,12 -163,20 +163,21 @@@ advice.*:
  	pushAlreadyExists::
  		Shown when linkgit:git-push[1] rejects an update that
  		does not qualify for fast-forwarding (e.g., a tag.)
+ 	pushFetchFirst::
+ 		Shown when linkgit:git-push[1] rejects an update that
+ 		tries to overwrite a remote ref that points at an
+ 		object we do not have.
+ 	pushNeedsForce::
+ 		Shown when linkgit:git-push[1] rejects an update that
+ 		tries to overwrite a remote ref that points at an
+ 		object that is not a committish, or make the remote
+ 		ref point at an object that is not a committish.
  	statusHints::
  		Show directions on how to proceed from the current
 -		state in the output of linkgit:git-status[1] and in
 +		state in the output of linkgit:git-status[1], in
  		the template shown when writing commit messages in
 -		linkgit:git-commit[1].
 +		linkgit:git-commit[1], and in the help message shown
 +		by linkgit:git-checkout[1] when switching branch.
  	commitBeforeMerge::
  		Advice shown when linkgit:git-merge[1] refuses to
  		merge to avoid overwriting local changes.