====== Slydders GIT cheatsheet ======

Here it is. The cheatsheet I always find handy when dealing with GIT.

===== setup the remote repository =====

<konsole>
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ ssh git@example.com
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ mkdir my_project.git
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ cd my_project.git
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git init --bare
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git-update-server-info
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ exit
</konsole>

===== On local machine =====

<konsole>
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ cd my_project
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git init
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git add *
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git commit -m "My initial commit message"
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git remote add origin git@example.com:my_project.git
<fc #00FF00>chuck@Vacant [master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ git push -u origin master
</konsole>

===== Checkout from Subversion =====

   1. cd /path/to/git/localrepo
   2. svn mkdir --parents protocol:///path/to/repo/PROJECT/trunk -m "Importing git repo"
   3. git svn init protocol:///path/to/repo/PROJECT -s
   4. git svn fetch
   5. git rebase trunk
   5.1.  git status
   5.2.  git add (conflicted-files)
   5.3.  git rebase --continue
   5.4.  (repeat 5.1.)
   6. git svn dcommit

===== Hard Reset =====

When applying/popping a stash and everything just decides to dump on you then you may have no other option:

<file>
git reset --hard
</file>

===== .bashrc entries =====

Have your terminal prompt display what branch you are currently on in red.

<file>
function parse_git_branch_and_add_brackets {
  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\ \[\1\]/'
}
PS1="\[\e]0;\w\a\]\n\[\e[32m\]\u@\h\[\033[0;31m\]\$(parse_git_branch_and_add_brackets) \[\e[33m\]\w\[\e[0m\]\$ "
</file>

Generates a prompt such as:

<konsole>
<fc #00FF00>chuck@Vacant</fc> <fc #FF0000>[master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ cd ..
<fc #00FF00>chuck@Vacant</fc> <fc #FFFF00>~/Projects/splinked</fc>$
</konsole>


===== git aliases =====

<file>
# aliases for common git commands
alias g='git'
alias st='git status'
alias push='git push'
alias commit='git commit'
alias log='git log'
alias stash='git stash'
alias checkout='git checkout'
alias branch='git branch'
alias fetch='git fetch'
alias merge='git merge'
alias cherry-pick='git cherry-pick'
alias rebase='git rebase'

# 'git pull --rebase' with a short log of the latest changes
pull () { local HEADHASH=`git describe --always --abbrev=40`; git pull --rebase $*; echo; PAGER='cat -B' git log --format="%C(yellow)%h %C(green)%an%C(reset): %s" $HEADHASH.. | sed -nr 's/([^:]+)\:/\1\t/;p'; }

# 'git pull --ff-only' with a short log of the latest changes
ff () { local HEADHASH=`git describe --always --abbrev=40`; git pull --ff-only $*; echo; PAGER='cat -B' git log --format="%C(yellow)%h %C(green)%an%C(reset): %s" $HEADHASH.. | sed -nr 's/([^:]+)\:/\1\t/;p'; }

# verbose add
add () { git add -v $*; git status; }

# verbose reset
reset () { git reset $*; git status; }

# 'git add' with 'git ls-files' and grep
# usage like grep - example: gadd 'readme.txt'
gadd () { git ls-files -co --exclude-standard | grep $* | xargs git add -v; git status; }

# 'git reset' with 'git ls-files' and grep
greset () { git ls-files | grep $* | xargs git reset; git status; }

# Enable auto-completion for aliased 'git' command
complete -o default -o nospace -F _git g

get_git_branch() {
  echo `git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
}
alias gpull='git pull origin `get_git_branch`'
alias gpush='git push origin `get_git_branch`'
</file>

===== Removing files/directories directly from the SVN server =====

<konsole>
<fc #00FF00>chuck@Vacant</fc> <fc #FF0000>[master]</fc> <fc #FFFF00>~/Projects/splinked</fc>$ cd ..
<fc #00FF00>chuck@Vacant</fc> <fc #FFFF00>~/Projects/splinked</fc>$
</konsole>