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: Carlos Martín Nieto <hidden>
Date: 2016-06-15 22:53:01

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

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help