Skip to content

Instantly share code, notes, and snippets.

@EtienneRd
Created February 28, 2016 14:52
Show Gist options
  • Save EtienneRd/79f876590d7ebd49b249 to your computer and use it in GitHub Desktop.
Save EtienneRd/79f876590d7ebd49b249 to your computer and use it in GitHub Desktop.
git config
[core]
editor = nano
[color]
diff = auto
status = auto
branch = auto
[alias]
co = checkout
br = branch
st = status
a = add
ci = commit
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
graph = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
[diff]
tool = opendiff
[merge]
tool = opendiff
[mergetool "opendiff"]
cmd = /usr/bin/opendiff \"$REMOTE\" \"$LOCAL\" -ancestor \"$BASE\" -merge \"$MERGED\" | cat
[push]
default = simple
[mergetool]
keepBackup = false
[branch]
autosetuprebase = always
[fetch]
prune = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment