Set up git daemon (server)
Init new repo with
git init . or use existing
server# git daemon --enable=receive-pack --listen=10.8.88.13 --export-all --base-path=/usr/share/nginx/html
Cloning repo on client
git clone git://10.8.88.13/repo
switch to local branch on client
git checkout -b laptop
adding changes
(first time)
user@client path/to/repo$ git add .user@client path/to/repo$ git commit -m "comment string"user@client path/to/repo$ git push --set-upstream origin laptop(next times)
user@client path/to/repo$ git add . && git commit -m "new changes" && git push
Merge changes on server
$ cd path/to/repo
repo$ git checkout master
repo$ git merge laptop