Git-Automerge

["Nico Schümann" <nico.schuemann@googlemail.com>]

Dear Git people,

after having been convinced by Linus Torvald's talk on git, I've been
using it for some days now.

But there is one thing that just does not get into my mind, or maybe I
am just thinking too complicated.

What I have is a productive system, let's call it MASTER and my
development machine, call it ME.

Now I made a copy of the MASTER tree by
$ git pull me@master:/path/to/stuff

And did some changes:
$ nano -w blablabla

Then I commited:
$ git commit

Everything fine until now.

What I want now are the changes to apper on the MASTER server, so I say
$ git push

But the changes do not appear on the master server. I have to type

# git reset --hard      or
# git checkout -f
in order to make the changes appear. Since I do not want to login onto
that MASTER machine every time, what command do I miss on my developer
machine?

Thanks in advantage,
Nico