# Please copy this part to your ~/.gitconfig
# or include it if git > 0.7.10

[alias]
   commit = commit -s # Always sign commit
   stash = stash -u   # you want to stash untracked files also
   st = status
   ci = commit
   br = branch
   co = checkout
   df = diff
   lg = log -p
   loo = log --pretty=oneline --abbrev-commit
   lol = log --graph --decorate --pretty=oneline --abbrev-commit
   lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
   rewrite-history   = rebase -i HEAD~2
   rewrite-history1  = rebase -i HEAD~
   rewrite-history2  = rebase -i HEAD~2
   rewrite-history3  = rebase -i HEAD~3
   rewrite-history4  = rebase -i HEAD~4
   rewrite-history5  = rebase -i HEAD~5
   rewrite-history6  = rebase -i HEAD~6
   rewrite-history7  = rebase -i HEAD~7
   rewrite-history8  = rebase -i HEAD~8
   rewrite-history9  = rebase -i HEAD~9
   rewrite-history10 = rebase -i HEAD~10
   tags = tag -l
   branches = branch -a
   remotes = remote -v

# This only works if git > 0.7.10
# # [include]
# #    path = /home/username/.oh-my-zsh/dot_files/gitconfig

[color]
ui = auto

[core]
editor = vim

[commit]
template = /home/username/.gitmessage

[merge]
tool = kdiff3

[guitool "mergetool"]
cmd = git mergetool --no-prompt

[mergetool "kdiff3"]
cmd = kdiff3
args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
keepBackup = false