Merge branch 'cr/push-force-tag-update'
commit9a2c83d24cb547c49e320d2498863b0ef297acd4
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:34 +0000 (5 23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:34 +0000 (5 23:41 -0800)
tree1fbaef7603b7ec12260e95f0543db36f2fb432c5
parent76523cac2688b1c9e8b56bd2c1a7a0ae1370e905
parentb450568209c8ae270d26ee7fda2e4687ad8a5327
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
Documentation/config.txt
Documentation/git-push.txt
cache.h
remote.c