[Opendnssec-develop] RE: Move to git

[Rickard Bellgrim]

>
> No, I've not made any config.
>
> Where is the workflow/instructions are you getting merge commits?
>

When I do "git merge upstream/develop develop":

$ git branch -D gitignore
Deleted branch gitignore (was 15e51fa).

$ git push origin :gitignore
To git at github.com:bellgrim/SoftHSMv1.git
 - [deleted]         gitignore

$ git fetch upstream
remote: Counting objects: 4, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
>From https://github.com/opendnssec/SoftHSMv1
 * [new branch]      develop    -> upstream/develop
 * [new branch]      master     -> upstream/master

$ git merge upstream/master master
Already up-to-date. Yeeah!

$ git merge upstream/develop develop
Fast-forwarding to: upstream/develop
Already up-to-date with develop
Merge made by the 'octopus' strategy.
 .gitignore |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .gitignore

$ git log
commit a64ee8215df6c0b8839a826df2d7a4c4f81971b3
Author: Rickard Bellgrim <rickard at opendnssec.org>
Date:   Tue Feb 4 09:06:43 2014 +0100

    Merge branch 'develop', remote-tracking branch 'upstream/develop' into
devel

$ git push --all
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 890 bytes, done.
Total 5 (delta 2), reused 0 (delta 0)
To git at github.com:bellgrim/SoftHSMv1.git
   050e4e8..a64ee82  develop -> develop
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140204/c9e4b796/attachment.htm>