Skip to content

Instantly share code, notes, and snippets.

@martincik
Created August 10, 2016 07:50
Show Gist options
  • Save martincik/cffe4f1c37a0c83993c04b979f03025b to your computer and use it in GitHub Desktop.
Save martincik/cffe4f1c37a0c83993c04b979f03025b to your computer and use it in GitHub Desktop.
Git Config
[core]
excludesfile = /Users/lmartincik/.gitignore
editor = vim
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
whitespace=trailing-space,space-before-tab
[user]
name = Ladislav Martincik
email = ladislav.martincik@gmail.com
[merge]
tool = diffmerge
[alias]
co = checkout
br = branch
ci = commit
st = status
unstage = reset HEAD --
last = log -1 HEAD
visual = !gitk
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
lol = log --pretty=oneline --abbrev-commit --graph --decorate
[color]
diff = auto
status = auto
branch = auto
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[credential]
helper = osxkeychain
[http]
sslVerify = false
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment