Skip to content

Instantly share code, notes, and snippets.

@robinclart
Created January 5, 2017 04:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save robinclart/d93afc844ff2c24418d58455cc5a9b6d to your computer and use it in GitHub Desktop.
Save robinclart/d93afc844ff2c24418d58455cc5a9b6d to your computer and use it in GitHub Desktop.
.gitconfig
[core]
excludesfile = ~/.gitignore
[user]
name = Robin Clart
email = robin@omise.co
[alias]
pending = !git add -A && git commit -m pending
pop = !git reset --soft HEAD~1 && git reset
last = !git --no-pager log -1 --format=full
[push]
default = simple
[diff]
tool = Kaleidoscope
compactionHeuristic = true
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[hub]
protocol = https
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[interactive]
diffFilter = diff-highlight
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment