[Opendnssec-develop] Move to git

[Rickard Bellgrim]

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

> On Fri, Feb 7, 2014 at 9:50 AM, Jerry Lundström <jerry at opendnssec.org>wrote:
>
>> On Fri, Feb 7, 2014 at 9:34 AM, Rickard Bellgrim <rickard at opendnssec.org>wrote:
>>
>>> $ git merge --ff-only upstream/master master
>>> $ git merge upstream/master
>>>
>>
>> What branch where you on when you did merge without --ff-only?
>>
>
> I missed that this was SoftHSMv2 and there is only one branch.
>
> What git version are you running?
>

git version 1.7.9.5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140207/c0adc86e/attachment.htm>