diff options
| author | Chris Rorvick <chris@rorvick.com> | 2012-11-29 19:41:38 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-02 01:44:49 -0800 |
| commit | 40eff1799983b958d6dbe09fb499ad505bcf6f8d (patch) | |
| tree | 0de96f181ffa8de1990f42305a4ad4f0bbc11f02 /Documentation/git-push.txt | |
| parent | dbfeddb12e5bb540ed3c852eebda3df9117bd150 (diff) | |
| download | git-40eff1799983b958d6dbe09fb499ad505bcf6f8d.tar.gz | |
push: require force for annotated tags
Do not allow fast-forwarding of references that point to a tag object.
Updating from a tag is potentially destructive since it would likely
leave the tag dangling. Disallowing updates to a tag also makes sense
semantically and is consistent with the behavior of lightweight tags.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
| -rw-r--r-- | Documentation/git-push.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 09bdec75bc..7a04ce5f21 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -52,11 +52,11 @@ updated. + The object referenced by <src> is used to update the <dst> reference on the remote side. By default this is only allowed if <dst> is not -under refs/tags/, and then only if it can fast-forward <dst>. By having -the optional leading `+`, you can tell git to update the <dst> ref even -if it is not allowed by default (e.g., it is not a fast-forward.) This -does *not* attempt to merge <src> into <dst>. See EXAMPLES below for -details. +a tag (annotated or lightweight), and then only if it can fast-forward +<dst>. By having the optional leading `+`, you can tell git to update +the <dst> ref even if it is not allowed by default (e.g., it is not a +fast-forward.) This does *not* attempt to merge <src> into <dst>. See +EXAMPLES below for details. + `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. + |