Skip to content

Instantly share code, notes, and snippets.

Last active August 29, 2015 14:12
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
What would you like to do?
name = Felipe Lima
email =
excludesfile = ~/.gitignore_global
editor = /usr/bin/vim
# Mergetool for mac os env
# [mergetool "sourcetree"]
# cmd = /Applications/ \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
# trustExitCode = true
conflictstyle = diff3
tool = kdiff3NoAuto
[mergetool "kdiff3NoAuto"]
cmd = kdiff3 --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
ui = true
diff = auto
branch = auto
status = auto
interactive = auto
external = ~/open-git-diff
tool = meld
default = current
[alias] a = add
[alias] au = add -u
[alias] st = status
[alias] ra = remote add
[alias] ca = clean -f -d
[alias] kl = clean -f -d
[alias] cl = clone --recursive
[alias] co = commit -m
[alias] cb = commit --allow-empty -m
[alias] cob = commit --allow-empty -m
[alias] b = branch -a
[alias] br = branch -a
[alias] fe = fetch --tags
[alias] ft = fetch --all
[alias] df = diff HEAD
[alias] dft = difftool HEAD
[alias] ps = push
[alias] pl = pull
[alias] up = pull --rebase
[alias] l = log
[alias] l1 = log -n1
[alias] ch = checkout
[alias] chm = checkout master
[alias] re = reset --hard HEAD
[alias] s = submodule foreach git
[alias] sub = submodule foreach git
[alias] sup = submodule update
[alias] subup = submodule update
[alias] sth = stash list
[alias] sthl = stash list
[alias] sths = stash save
[alias] sthd = stash drop
[alias] stha = stash apply
[alias] sthp = stash pop
[alias] t = tag
[alias] tree = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green)a:%an, %ar %C(blue)c:%cn, %cr%Creset'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment