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 unnecessary merge commit > +especially when you do not have any work on your own. In such a > +case, you can "unwrap" the tag yourself before feeding it to `git > +merge`, e.g. > + > +--- > +git fetch origin > +git merge [--ff-only] v1.2.3^0 > +---
Nice and clear, but doesn't this contradict b5c9f1c1b0ed (merge: do not create a signed tag merge under --ff-only option, 2012-02-05)? -- 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
