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

2013-03-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: +MERGING TAG +--- + +When merging a tag (annotated or signed), Git will create a merge commit +... +if the tag was signed. See also linkgit:git-tag[1]. + It would make it more helpful to readers to describe how _not_ to create such a

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

2013-03-21 Thread Jonathan Nieder
Junio C Hamano wrote: +Consequently a request `git merge --ff-only v1.2.3` to merge such a +tag would fail. + +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

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

2013-03-21 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Nice and clear, but doesn't this contradict b5c9f1c1b0ed (merge: do not create a signed tag merge under --ff-only option, 2012-02-05)? It does X-. Here is a replacement. The --ff-only v1.2.3 will fail can be left unsaid because it would fail (and

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

2013-03-21 Thread Jonathan Nieder
Junio C Hamano wrote: Here is a replacement. Looks good. Thanks for taking care of this. -- 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

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

2013-03-21 Thread Yann Droneaud
Hi, Just a little change I made on my own. The other part are definitely better than my version, so I propose to merge all the patches in the thread with you as author, putting Jonathan Nieder and myself as reviewers. Regards Documentation/git-merge.txt | 4 ++-- 1 file changed, 2

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

2013-03-20 Thread Yann Droneaud
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

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

2013-03-20 Thread Jonathan Nieder
Yann Droneaud wrote: 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. Thanks. This looks good, modulo some nitpicks. [...] ---

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

2013-03-20 Thread Junio C Hamano
Yann Droneaud ydrone...@opteya.com writes: 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