git - mo khan

my git-svn workflow

git svn clone http://svn-repo -T trunk -b branches -t tags
cd svn-repo
git svn rebase
git branch -f development
git checkout development
gvim hello-world.mkd -- edit file
gvim goodbye-world.mkd -- edit file
git add .
git commit -am "added hello world, and good bye"
git checkout master
git svn rebase
git merge --squash development
git commit -- squash commit message
git svn dcommit
git branch -f development
git checkout development
rm goodbye-world.mkd
git add -A
git commit -am "removed goodbye."
git checkout master
git svn rebase
git merge --squash development
git commit -- edit and squash the commit message.
git svn dcommit

To create an SVN tag from git.

1   $ git svn branch -t {tagname}

creating an ssh key

windows

$ cd ~/.ssh $ ssh-keygen -t rsa -C "email@mokhan.ca"

managing multiple accounts

unfuddle

in your .ssh config you can specify which rsa keys to use for different domains. e.g.

1     ~/.ssh/config
2     Host project1.unfuddle.com
3         User git
4         IdentityFile ~/.ssh/project1/id_rsa
5 
6     Host *.unfuddle.com
7         User git
8         IdentityFile ~/.ssh/id_rsa

toubleshooting

hosting git yourself

1 $ sudo adduser git
2 $ login git
3 $ mkdir test.git
4 $ cd test.git
5 $ git init --bare
6 $ git remote rm origin
7 $ git remote add origin git@server.com:test.git
8 $ git push origin master

git submodules

tutorial fix path * on windows I had to fix the path in .gitmodules from .\src\Messages to src/Messages

submodules for git-svn

tutorial

links

tips for intermediates git svn externals private git server setup