path: root/Documentation/merge-options.txt
diff options
authorJunio C Hamano <>2013-03-21 21:57:48 (GMT)
committerJunio C Hamano <>2013-03-21 22:47:38 (GMT)
commit77c72780edfa5e3858423366fc91699724793b39 (patch)
treea99b3e5cd412ea5ddd2c4119d5c88d49d3dbabec /Documentation/merge-options.txt
parent5d417842efeafb6e109db7574196901c4e95d273 (diff)
Documentation: merging a tag is a special case
When asking Git to merge a tag (such as a signed tag or annotated tag), it will always create a merge commit even if fast-forward was possible. It's like having --no-ff present on the command line. It's a difference from the default behavior described in git-merge.txt. It should be documented as an exception of "FAST-FORWARD MERGE" section and "--ff" option description. Reviewed-by: Jonathan Nieder <> Reviewed-by: Yann Droneaud <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/merge-options.txt')
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 0bcbe0a..34a8445 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -30,7 +30,8 @@ set to `no` at the beginning of them.
Create a merge commit even when the merge resolves as a
- fast-forward.
+ fast-forward. This is the default behaviour when merging an
+ annotated (and possibly signed) tag.
Refuse to merge and exit with a non-zero status unless the