Thread (4 messages) flat view 4 messages, 4 authors, 2016-06-15

Re: How to update? (git Changed but not updated)

From: Sitaram Chamarty <hidden>
Date: 2016-06-15 22:46:15

On 2009-02-21, Reto S. News [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help