On Thu, Feb 09, 2012 at 05:06:41PM +0100, Carlos Martín Nieto wrote: > On Thu, 2012-02-09 at 10:54 +0100, Domenico Andreoli wrote: > > Hi, > > > > with the recent changes in tag merging (I updated git to 1.7.9), > > my usual "git merge v3.X-rcY" command does not fast-forward any more. > > Of course the initial head is something like "v3.X-rcZ" without any > > change so that it should (and usually did) fast-forward to the new head. > > > > The editor is instead fired off and I have to fill the details of a > > merge commit, diverging from mainline as soon as I save and exit. > > > > Is there any simple and clear explanation for this? Thank you. > > > > cheers, > > Domenico > > > > ps: I admit I didn't follow the details about tag signatures so probably > > I missed something that I shouldn't. > > This was discussed recently > > http://thread.gmane.org/gmane.comp.version-control.git/189825 The command I was looking for is: $ git merge --ff-only v3.X-rcY^0 thanks, Domenico -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html