[Opendnssec-develop] Move to git

[Jerry Lundström]

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.

$ git fetch upstream
remote: Counting objects: 16, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 11 (delta 8), reused 6 (delta 3)
Unpacking objects: 100% (11/11), done.
>From https://github.com/opendnssec/SoftHSMv2
   d18258d..ba823f4  master     -> upstream/master
$ git merge --ff-only upstream/master master
Updating d18258d..ba823f4
Fast-forward
 README.md                |  4 ++--
 m4/acx_crypto_backend.m4 | 16 ++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

-- 
Jerry Lundström - OpenDNSSEC Developer
http://www.opendnssec.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140207/b921dfb4/attachment.htm>