Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Re: Merging tags does not fast-forward with git 1.7.9

From: Dan Johnson <hidden>
Date: 2016-06-15 22:53:01

On Thu, Feb 9, 2012 at 4:54 AM, Domenico Andreoli [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help