Seems to work now. If I always merge the feature branch with "--no- ff". I guess that was why it was working sometimes before, when git decided not to use fast forward merges.
I have put this into my config now: [branch "master"] mergeoptions = --no-ff [branch "live"] mergeoptions = --no-ff -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
