On Thu, Feb 9, 2012 at 4:54 AM, Domenico Andreoli <cavokz@xxxxxxxxx> 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. Someone else can explain what is going on more fully, but can you report what happens when you run "git merge --ff-only v3.X-rcY"? -- -Dan -- 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