From 30a69086a6cb7a0b867534d526de83f9b573f17b Mon Sep 17 00:00:00 2001 From: sdhou Date: Wed, 1 Nov 2023 18:19:44 +0800 Subject: [PATCH] up git config --- .gitconfig | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 6e8f1fe..7e84417 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] - name = sdhou - email = xiaohou.don@gmail.com + name = sdhou + email = xiaohou.don@gmail.com [color] ui = true [alias] @@ -10,3 +10,19 @@ br = branch a = add -A ci = commit -a +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[core] + excludesfile = /Users/sdhou/.gitignore_global + quotepath = false +[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 +[pull] + rebase = true