Re: DragonFly BSD source repository branch, master, updated. 7fc7e029e2b0bc155f8d694a0597ea3b2c27b761

["Nicolas Thery" <nthery@xxxxxxxxx>]

> - Log -----------------------------------------------------------------
> commit 7fc7e029e2b0bc155f8d694a0597ea3b2c27b761
> Merge: caf92acab6c7aff17107d1a7ce021a96761ef853 3f3f2646e1abbc95b6129e9fc6623fc9d23a1f74
> Author: Nicolas Thery <nthery@gmail.com>
> Date:   Fri Nov 28 13:16:55 2008 +0100
>
>    Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
>
> commit caf92acab6c7aff17107d1a7ce021a96761ef853
> Author: Nicolas Thery <nthery@gmail.com>
> Date:   Fri Nov 28 13:12:21 2008 +0100
>
>    Test switch to git repo.

Damn, it didn't do exactly what I wanted.

Is there a way not to push merge commits? (the first one above)

Is committing directly to my local master branch a bad idea? Maybe I
should commit only on local
'topic' branches and use master as a read-only upstream reference.

FWIW, here is what I did is:

# clone repo
git clone -o corecode -n git://chlamydia.fs.ei.tum.de/dragonfly.git

# make myself known
git config --global user.name "Nicolas Thery"
git config --global user.email "nthery@gmail.com"

# populate 'main' branch
git checkout master

# work
vim test/test/README

# check-in changes on local master branch
git add test/test/README
git commit

# register shortcut for crater
git remote add crater ssh://crater.dragonflybsd.org/repository/git/dragonfly.git

# try to push to crater
git push crater

# Git complains because Sephe pushed sth after I pulled

# Update
git pull corecode

# push again
git push crater