From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Jan 2013 07:41:34 +0000 (-0800)
Subject: Merge branch 'cr/push-force-tag-update'
X-Git-Tag: v1.8.2-rc0~185
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/9a2c83d24cb547c49e320d2498863b0ef297acd4

Merge branch 'cr/push-force-tag-update'

Require "-f" for push to update a tag, even if it is a fast-forward.

* cr/push-force-tag-update:
  push: allow already-exists advice to be disabled
  push: rename config variable for more general use
  push: cleanup push rules comment
  push: clarify rejection of update to non-commit-ish
  push: require force for annotated tags
  push: require force for refs under refs/tags/
  push: flag updates that require force
  push: keep track of "update" state separately
  push: add advice for rejected tag reference
  push: return reject reasons as a bitset
---

9a2c83d24cb547c49e320d2498863b0ef297acd4
diff --cc Documentation/config.txt
index bf8f911e1f,90e7d10bad..50a2288999
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -158,12 -159,14 +159,15 @@@ advice.*:
  		'matching refs' explicitly (i.e. you used ':', or
  		specified a refspec that isn't your current branch) and
  		it resulted in a non-fast-forward error.
+ 	pushAlreadyExists::
+ 		Shown when linkgit:git-push[1] rejects an update that
+ 		does not qualify for fast-forwarding (e.g., a tag.)
  	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.