Git

Pushing changes:

• (From my laptop, on the vpn): git push

Pulling changes:

• (From laptop, in different dir): git pull

Tutorial:

http://www.ralfebert.de/blog/<wbr>tools/git_screencast/

Workflow:

• git checkout master
• svn up
• git add --update
• git commit -m "svn sync"
• git checkout dev_kalida
• git merge master
• ... make changes...
• git add --update
• git commit -m "changes"
• git push [from session with access to the vpn]  

Git remote show origin

kazad@kazadbook gitshare3 (master) $ git remote show origin
* remote origin
  URL: ssh://kalida@... /home/kalida/git
  Remote branch merged with 'git pull' while on branch master
    master
  Tracked remote branches
    dev_kalida
    master
    tags

Setting up new branch

git remote add origin ssh://kalida@192.168.168.157/home/kalida/git

root@dekiwiki test1  $ git clone ssh://kalida@192.168.168.157/home/kalida/git dev_kalida
Initialized empty Git repository in /tmp/test1/dev_kalida/.git/
kalida@192.168.168.157's password: 
remote: Counting objects: 10697, done.
remote: Compressing objects: 100% (5374/5374), done.
remote: Total 10697 (delta 5520), reused 9514 (delta 4556)
Receiving objects: 100% (10697/10697), 31.86 MiB | 1014 KiB/s, done.
Resolving deltas: 100% (5520/5520), done.

root@dekiwiki test1  $ ls
dev_kalida

root@dekiwiki test1  $ cd dev_kalida
root@dekiwiki dev_kalida (master) $ git br -a
* master
  origin/HEAD
  origin/bugfix_kalida
  origin/feature_rating
  origin/master

root@dekiwiki dev_kalida (master) $ git checkout -t origin/bugfix_kalida -b bugfix
Branch bugfix set up to track remote branch refs/remotes/origin/bugfix_kalida.
Switched to a new branch "bugfix"
root@dekiwiki dev_kalida (bugfix) $ git pull
kalida@192.168.168.157's password: 
Already up-to-date.
root@dekiwiki dev_kalida (bugfix) $ 

.gitignore:

# MindTouch items to ignore
LocalSettings*.*
devtools_firephp
mindtouch_drafts
.orig
cdn_*
tmp/
resources/resources.custom.txt
skins/*.php

.bash_profile:

alias sync='svn revert -R * && svn up && git add --update && git commit -m "svn sync"'

.gitexcludes

.svn/
.svn

# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite

# OS generated files #
######################
.DS_Store?
ehthumbs.db
Icon?
Thumbs.db