[Opendnssec-develop] Move to git

Fri Feb 7 09:59:02 UTC 2014

On Fri, Feb 7, 2014 at 10:42 AM, Jerry Lundström <jerry at opendnssec.org>wrote:

> I have my own SoftHSMv2 fork now but I am unable to replicate the problem
> (git 1.8), --ff-only works and it's there to prevent merge commits. I don't
> know why your git did not merge with --ff-only but then merged with ff.
>

It also worked when I removed the last part of the command:

$ git merge --ff-only upstream/master

Maybe a difference in the two versions...

// Rickard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140207/46d77a92/attachment.htm>