Skip to content

Instantly share code, notes, and snippets.

@Kadrei
Created November 26, 2018 07:07
Show Gist options
  • Save Kadrei/635ee5cb4878871f8902f91bafd6a59a to your computer and use it in GitHub Desktop.
Save Kadrei/635ee5cb4878871f8902f91bafd6a59a to your computer and use it in GitHub Desktop.
This is Git's per-user configuration file.
[user]
name = Benedikt Kusemann
email = benedikt.kusemann@gmail.com
[core]
editor = vim +2
autocrlf = input
fileMode = false
excludesfile = /Users/benedikt.kusemann/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
[alias]
st = status -sb
lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' -10
ll = log --oneline --graph --decorate --all
vimdiff = difftool -t vimdiff
co = checkout
ci = commit
root = rev-parse --show-toplevel
prune = fetch --prune
undo = reset --soft HEAD^
stash-all = stash save --include-untracked
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
cu = !git branch --merged | egrep -v \"(^\\*|master|develop)\" | xargs git branch -d
unstage = reset HEAD
wtf = log -p
l = log --oneline --graph
b = branch
c = commit
p = pull —rebase
[color]
branch = auto
diff = auto
status = auto
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta bold
old = red bold
new = green bold
commit = yellow bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[branch]
autosetuprebase=always
tool = intellij
[difftool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
[merge]
conflictstyle = diff3
tool = intellij
[mergetool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[credential]
helper = osxkeychain
[push]
default = simple
followTags = true
[status]
showUntrackedFiles = all
[transfer]
fsckobjects = true
[diff]
indentHeuristic = true
colorMoved = dimmed_zebra
[commit]
template = /Users/benedikt.kusemann/dotfiles/git-commit.tmpl
[rebase]
autosquash = true
[pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment