TubeTK/Development/GITCheatSheet

Workspace tips

• Show branch in prompt

PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\[\033[01;33m\]`git branch 2>/dev/null|cut -f2 -d\* -s|sed -e"s/ //g"`\[\033[00m\]\$ '

• gitk is a great tool for visualizing the git history and seeing where your master or branch is wrt origin:master

gitk

Maintain a linear git history

Helpful scripts

• http://www.dinnermint.org/tutorial/dead-simple-git-workflow-for-agile-teams

gitupdate

#!/bin/sh -x
# hack: Merge the latest changes from the master branch into your current branch
ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0
CURRENT="${ref#refs/heads/}"
git checkout master
git pull origin master
git checkout ${CURRENT}
git rebase master

gitship

#!/bin/sh -x
# Git workflow ship script from: http://reinh.com/blog/2008/08/27/hack-and-and-ship.html
# git name-rev is fail
ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0
CURRENT="${ref#refs/heads/}"
git checkout master
git merge ${CURRENT}
git push origin master
git checkout ${CURRENT}

Workflow recommendation

We recommend the scripts described above. They implement the following, and save you much typing and potential errors! Most importantly, do your work in branches, not in master!

1. Keep a local master branch which only is a pointer to the gitorious master (does not contain local changes)
2. Make development modification in a local branch
3. When getting ready to push these changes to the origin try the following
   1. Do a git pull on master to fetch and merge all changes from gitorious
      1. git checkout master
      2. git pull origin master
   2. Do a git rebase of the topic branch onto master - That is with topic checkout do "git rebase master"
      1. git rebase master topic
   3. Fix any conflicts that result
      1. Edit files
      2. git add -u
      3. git rebase --continue
   4. Merge the topic branch - This will result in an fast-forward merge.
      1. git merge topic
   5. git push your local master branch
      1. git push origin master
4. If for some reason you have ever pushed your development branch to someone else don't rebase it as this is effectively rewriting history
5. If you want to keep a record that your local development was made in parallel to some other development, do a git merge instead of git rebase in step 2 of above

Create a checkout

• git clone git://gitorious.org/tubetk/tubetk.git

Stash local changes temporarily

• git stash

Create a local branch

• git branch test

Swtich to a local branch

• git checkout test

Get stashed local changes

• git stash pop

Update a branch to the remote master's head

• git stash
• git rebase origin master
• git stash pop

Add to local commit

• git add <filename>
• git add -A

Push local commit

• git push origin master

Remove a local branch

• git checkout master
• git branch -d <branch>

Track a remote branch

• "git fetch" (get up to date) or "git pull"
• git branch --track somebranch origin/somebranch
  • --track is not needed unless you've set branch.autosetupmerge to false in your config
• git checkout somebranch
• git commit
• git push
  • sends changes to origin/somebranch

Delete a remote branch

• Don't do this unless you're incredibly confident in what you're doing
• git push origin :somebranch

Project History

• git log ( To view the history of your changes )
• git log -p ( To see complete diffs at each step )
• git log --stat --summary ( To see overview )

Setting up tracked repositories to start pushing

1. If you have cloned read-only version, do the following first
   1. git remote rm origin
2. Add the proper remote
   1. git remote add origin git@gitorious.org:tubetk/tubetk.git
3. You can push your changes
   1. git push origin master

git://gitorious.org/tubetk/tubetk.git

Three ways to commit to remote/master

1. Without branching ( Good for quick changes )
2. Branching and merging
3. Branching and rebasing

Additional References

• GIT tutorial [1]
• GIT guide from gitorious [2]
• GIT guide in CMake [3]