[alias] lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit dd = difftool --dir-diff [diff] tool = araxis [difftool "winmerge"] #cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -e "$LOCAL" "$REMOTE" tool = araxis [user] name = StevenKing email = StevenKing@StevenKingOnline.com [difftool "sourcetree"] cmd = 'C:/Program Files/Araxis/Araxis Merge/compare.exe' \"$LOCAL\" \"$REMOTE\" trustExitCode = true [mergetool "sourcetree"] cmd = 'C:/Program Files/Araxis/Araxis Merge/compare.exe' -wait -merge -3 \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\" trustExitCode = true [difftool "araxis"] cmd = 'C:/Program Files/Araxis/Araxis Merge/compare.exe' -wait -max \"$LOCAL\" \"$REMOTE\" [mergetool "araxis"] cmd = 'C:/Program Files/Araxis/Araxis Merge/compare.exe' -wait -max -merge -3 \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\" trustExitCode = true