diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:34 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:34 -0800 |
commit | 9a2c83d24cb547c49e320d2498863b0ef297acd4 (patch) | |
tree | 1fbaef7603b7ec12260e95f0543db36f2fb432c5 /git-mergetool--lib.sh | |
parent | Merge branch 'fc/fast-export-fixes' (diff) | |
parent | push: allow already-exists advice to be disabled (diff) | |
download | tgif-9a2c83d24cb547c49e320d2498863b0ef297acd4.tar.xz |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions