summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-28 21:38:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-28 21:38:17 (GMT)
commitf1c8d8338f54c5aec18f4d0efa37cec30aafe12a (patch)
tree3e5186091020934412d318b906d4f3eeafcfc75f /Documentation/git-merge.txt
parent436b60ce7aac4cf8e496c57c9baae46094571b22 (diff)
parent77c72780edfa5e3858423366fc91699724793b39 (diff)
downloadgit-f1c8d8338f54c5aec18f4d0efa37cec30aafe12a.zip
git-f1c8d8338f54c5aec18f4d0efa37cec30aafe12a.tar.gz
git-f1c8d8338f54c5aec18f4d0efa37cec30aafe12a.tar.bz2
Merge branch 'yd/doc-merge-annotated-tag'
Document the 1.7.9 feature to merge a signed tag and keep that in the mergetag header in the resulting commit better. * yd/doc-merge-annotated-tag: Documentation: merging a tag is a special case
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt24
1 files changed, 24 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c852a26..42391f2 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -170,6 +170,30 @@ happens:
If you tried a merge which resulted in complex conflicts and
want to start over, you can recover with `git merge --abort`.
+MERGING TAG
+-----------
+
+When merging an annotated (and possibly signed) tag, Git always
+creates a merge commit even if a fast-forward merge is possible, and
+the commit message template is prepared with the tag message.
+Additionally, if the tag is signed, the signature check is reported
+as a comment in the message template. See also linkgit:git-tag[1].
+
+When you want to just integrate with the work leading to the commit
+that happens to be tagged, e.g. synchronizing with an upstream
+release point, you may not want to make an unnecessary merge commit.
+
+In such a case, you can "unwrap" the tag yourself before feeding it
+to `git merge`, or pass `--ff-only` when you do not have any work on
+your own. e.g.
+
+---
+git fetch origin
+git merge v1.2.3^0
+git merge --ff-only v1.2.3
+---
+
+
HOW CONFLICTS ARE PRESENTED
---------------------------