Skip to content

Instantly share code, notes, and snippets.

@olivierlemoal
Last active January 11, 2017 14:54
Show Gist options
  • Save olivierlemoal/3c00c0adda161d3321ec to your computer and use it in GitHub Desktop.
Save olivierlemoal/3c00c0adda161d3321ec to your computer and use it in GitHub Desktop.
Git global conf
[user]
email = XXX
name = Olivier Le Moal
[push]
default = current
[core]
editor = vim
excludesfile = /home/olivier/.gitignore
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
logs = log --stat
[pull]
rebase = preserve
[branch]
autosetuprebase = always
[credential]
help = cache
[status]
# short = true
[sendemail]
smtpencryption = tls
smtpserver = XXX
smtpserverport = 587
smtpuser = XXX
[merge]
# tool = vimdiff
# call with "git mergetool"
tool = sublimerge
[mergetool "sublimerge"]
cmd = subl3 -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
trustExitCode = false
[diff]
# call with "git difftool"
tool = sublimerge
[difftool "sublimerge"]
cmd = subl3 -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment