d0zingcat/dotfiles
1
0
Fork 0
mirror of https://github.com/d0zingcat/dotfiles.git synced 2026-05-13 15:09:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source 
Signed-off-by: Lee Tang <i@d0zingcat.dev>
This commit is contained in:
Lee Tang
2023-01-31 11:55:55 +08:00
parent d89197d212
commit 5393e1eb58
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.Brewfile.Darwin.gooddeAir
View File

@@ -59,6 +59,7 @@ cask "bartender"
cask "brave-browser"
cask "charles"
cask "clash-for-windows"
cask "dash"
cask "datagrip"
cask "discord"
cask "docker"

6
git/config
View File

@@ -58,3 +58,9 @@
#[mergetool "sourcetree"]
# cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
# trustExitCode = true
[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