key git book pages to read

• https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
• https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows

git: merge request

• git checkout master
• git pull
• git branch -b <mybranch>
• <changes>
• git commit -am'My change commit'
• git push origin <mybranch>

tsunami-udp: faster than rsync

1. build
1. sudo apt-get install git gcc
2. sudo apt-get install automake autoconf
3. git clone git://github.com/rriley/tsunami-udp.git
4. cd tsunami-udp
5. ./recompile.sh
6. sudo make install
2. run
1. you'll need a port open to allow direct connection from client to server
1. unfortunately, this doesn't work through NAT firewalls alone
2. firewall / port forwarding
1. to server, TCP, 46224 by default
2. to client, UDP, 46224 by default
2. start up server
1. tsunamid myfile.gz
3. connect with client
1. tsunami set rate 5M connect myserver.domain.com get myfile.gz
2. it will flood your connection if you dont set rate properly
3. documentation
1. http://tsunami-udp.cvs.sourceforge.net/viewvc/tsunami-udp/docs/USAGE.txt
2. splits files automatically
3. allows wildcards when running server and client commands, "*", namely
1. client will auto-find all files served, one after the next
2. use forward-slash, i.e. get \*, for client command 
1. so bash doesn't intrepret the asterisk
4. undocumented
1. doesn't do subdirectories, better tar that up and have plenty of disk space

git push/pull just current branch

1. git config --global push.default tracking
2. git config --global pull.default tracking

FYI, these settings are saved in ~/.gitconfig

github and multiple accounts, git keeps asking for password

Taken: http://net.tutsplus.com/tutorials/tools-and-tips/how-to-work-with-github-and-multiple-accounts/

1. ssh-keygen -t rsa -C "me@mycompany.com" -f ~/.ssh/id_rsa_mycompany
2. ssh-add ~/.ssh/id_rsa_mycompany
3. Add below to ~/.ssh/config
4. git clone git@github-mycompany:mycompany/myrepo.git

Host github-mycompany

  HostName github.com

  User git

  IdentityFile ~/.ssh/id_rsa_mycompany