Skip to content

Instantly share code, notes, and snippets.

@robertobermejo
Last active January 1, 2016 15:29
Show Gist options
  • Select an option

  • Save robertobermejo/8164169 to your computer and use it in GitHub Desktop.

Select an option

Save robertobermejo/8164169 to your computer and use it in GitHub Desktop.
Git config
[user]
name = Roberto Bermejo Martinez
email = roberto@robertobermejo.es
[core]
excludesfile = /Users/rbermejo/.gitignore_global
editor = emacs
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[merge]
tool = vimdiff
[alias]
st = status
ci = commit
br = branch
co = checkout
df = diff
rb = rebase
lsd = log --graph --decorate --pretty=oneline --abbrev-commit --all
gg = !"clear" && git st
unstage = reset HEAD --
g = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
h = !git --no-pager log origin/master..HEAD --abbrev-commit --pretty=oneline
pom = !sh -c 'git h && echo Ready to push? ENTER && read && git push origin master' -
rem = !sh -c 'test "$#" = 1 && git h && git checkout master && git pull && git checkout \"$1\" && git rebase master && git checkout master && git merge \"$1\" && echo Done and ready to do: git pom && exit 0 || echo \"usage: git rem \" >&2 && exit 1' -
find = !git ls-tree -r --name-only HEAD | grep --color $1
purm = !git pull --rebase && git pom
v = !gvim $*
[color]
ui = true
[color "branch"]
current = yellow black
local = yellow
remote = magenta
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red reverse
new = green reverse
whitespace = white reverse
[color "status"]
added = yellow
changed = green
untracked = cyan reverse
branch = magenta
*~
.DS_Store
.idea
/vendor
composer.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment