From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Sun, 22 Feb 2009 01:10:20 GMT
Subject: Re: How to update? (git Changed but not updated)
Message-ID: <slrngq19fs.vna.sitaramc@sitaramc.homelinux.net>
In-Reply-To: <49A070B5.90909@dplanet.ch>

On 2009-02-21, Reto S. News <retoh@dplanet.ch> wrote:
> Beginner question: "How to update the pushed changes on the master?"
>
> On Slave Host (a Developer that receives a working copy of a project):
>
> $ git clone git://master.example.net/test myrepo
> $ cd myrepo   # ... here I see all received files from the master
> $ Changing file "foo.txt"
> $ git add .   # ... for whatever reason this is necessary
> $ git commit -m 'I changed this file'
> $ git push
>
> On Master Host (master.example.net):
>
> # git status # Shows me correctly foo.txt has been changed by the"Slave"
> # git show   # Shows me even the made changes in a diff style!

I'll bet the changes shown are 'reversed'...

> Now I have to update the fresh content produced by the "Slave". As an
> ugly work-around, I'm currently cloning it again from localhost :-|
>
> Any suggestions are very appreciated.

Your master is a non-bare repo.  Try
http://git.or.cz/gitwiki/GitFaq#non-bare .

I also wrote up a much more detailed description of this at
http://sitaramc.github.com/concepts-and-tips/0-terminology.html#a5
-- I hope it helps you.

Regards,

Sitaram