Re: [PATCH v2] Documentation: merging a tag is a special case

2013-03-21 Thread Jonathan Nieder
Yann Droneaud wrote: > Reviewed-by: Jonathan Nieder Yes, I think this is in good shape now. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2] Documentation: merging a tag is a special case

2013-03-21 Thread Yann Droneaud
From: Junio C Hamano 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 sh