Skip to content

Instantly share code, notes, and snippets.

@micabe
Last active January 19, 2018 10:49
Show Gist options
  • Save micabe/6d812cab341f8ccb3fce1d011b50ebb2 to your computer and use it in GitHub Desktop.
Save micabe/6d812cab341f8ccb3fce1d011b50ebb2 to your computer and use it in GitHub Desktop.
Git config
[user]
name = micabe
email = mickael@qare.io
[color]
ui = auto
[alias]
ac = !git add . && git commit -am
st = status
lg = log -10 --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
ps = push --no-verify
[core]
pager = cat
autocrlf = input
whitespace = -trailing-space
longpaths = true
filemode = false
excludesfile = /Users/quare-macbook/.gitignore_global
[diff]
mnemonicPrefix = true
wordRegex = .
tool = diffmerge
[fetch]
recurseSubmodules = on-demand
[grep]
extendedRegexp = true
[log]
abbrevCommit = true
[merge]
conflictStyle = diff3
tool = diffmerge
[mergetool]
keepBackup = false
keepTemporaries = false
prompt = false
[push]
default = upstream
[pull]
rebase = true
[rerere]
enabled = true
[status]
submoduleSummary = true
showUntrackedFiles = all
[difftool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
[commit]
template = /Users/quare-macbook/.stCommitMsg
[difftool "diffmerge"]
cmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"
[mergetool "diffmerge"]
cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment