-
Notifications
You must be signed in to change notification settings - Fork 1
/
setgitdtool
executable file
·22 lines (20 loc) · 798 Bytes
/
setgitdtool
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
#
# set the properties common to difftool and mergetool
#
git config --global merge.tool araxis
git config --global diff.tool araxis
git config --global --add difftool.prompt false
git config --global --add mergetool.prompt false
#
# set the mergetoll-specific properties
#
git config --global mergetool.araxis.cmd "araxis"
git config --global mergetool.araxis.trustExitCode true
git config --global mergetool.araxis.path 'path = '/Applications/Araxis\ Merge.app/Contents/Utilities/compare'
git config --global mergetool.keepBackup false
#
# set the difftool-specific properties
#
git config --global difftool.araxis.cmd "araxis"
git config --global difftool.araxis.trustExitCode true
git config --global difftool.araxis.path 'path = '/Applications/Araxis\ Merge.app/Contents/Utilities/compare'