Last active
March 3, 2017 13:03
-
-
Save mrandi/32e3dcff35997094c173 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true | |
[user] | |
name = xxx xxx | |
email = xxx@xxx.com | |
signingkey = xxx | |
[color] | |
ui = true | |
status = auto | |
branch = auto | |
[core] | |
editor = vim | |
excludesfile = /Users/xxx/.gitignore_global | |
autocrlf = input | |
[merge] | |
tool = intellij | |
[mergetool "intellij"] | |
cmd = /usr/local/bin/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 | |
[diff] | |
tool = intellij | |
[difftool "intellij"] | |
cmd = /usr/local/bin/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") | |
[alias] | |
co = checkout | |
br = branch | |
ci = commit | |
st = status | |
last = log -1 HEAD | |
visual = !gitk | |
g = grep --break --heading --line-number | |
l = log --oneline --decorate | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | |
[push] | |
default = simple | |
[transfer] | |
fsckobjects = true | |
[fetch] | |
fsckobjects = true | |
[receive] | |
# no rewriting history | |
denyNonFastForwards = true | |
# no deleting history | |
denyDeletes = true | |
# check object consistency | |
fsckObjects = true | |
[grep] | |
extendRegexp = true | |
lineNumber = true | |
[commit] | |
gpgsign = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment