mirror of
https://github.com/cupcakearmy/dotfiles.git
synced 2025-09-10 07:10:38 +00:00
vim & gitconfig
This commit is contained in:
@@ -7,13 +7,7 @@
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
[core]
|
||||
excludesfile = /Users/nicco/.gitignore_global
|
||||
excludesfile = $HOME/.gitignore_global
|
||||
autocrlf = input
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||
trustExitCode = true
|
||||
[commit]
|
||||
gpgsign = true
|
||||
|
Reference in New Issue
Block a user