alpha
/
dotfiles
1
0
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases Wiki Activity

mu

Browse Source
main
Alpha Chen 3 weeks ago
parent 4220940de3
commit ca6730cf14
No known key found for this signature in database
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
.gitconfig
Unescape View File

@ -88,6 +88,7 @@
enabled = true enabled = true
autoUpdate = true autoUpdate = true
[branch] [branch]
autoSetupMerge = simple
sort = -committerdate sort = -committerdate
[log] [log]
follow = true follow = true
@ -132,8 +133,6 @@
keepBackup = false keepBackup = false
[mergetool "vimdiff"] [mergetool "vimdiff"]
path = nvim path = nvim
[mergetool "nvimdiff"]
cmd = nvim -d \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool "sourcetree"] [mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true trustExitCode = true

Write Preview
Loading…
Cancel
Save