Last active
February 27, 2021 08:30
-
-
Save karthikmurugesan2/ba5ce15b86e868f2506aeb4216630c91 to your computer and use it in GitHub Desktop.
WSL + git + beyond compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alias gitdiff='git difftool -y --no-symlinks &' | |
export VISUAL=vim | |
export EDITOR="$VISUAL" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = BCompare | |
[mergetool] | |
prompt = false | |
[diff] | |
tool = BCompare | |
stat = true | |
guitool = bc4 | |
[difftool] | |
prompt = false | |
[difftool "BCompare"] | |
path = "/c/Program Files/Beyond Compare 4/BCompare.exe" | |
cmd = \"/c/Program Files/Beyond Compare 4/BCompare.exe\" -expandall \"`echo $LOCAL | sed 's_/c_C:_'`\" \"`echo $REMOTE | sed 's_/c_C:_'`\" | |
trustExitCode = true | |
[mergetool "BCompare"] | |
path = "/c/Program Files/Beyond Compare 4/BCompare.exe" | |
cmd = \"/c/Program Files/Beyond Compare 4/BCompare.exe\" -expandall \"`echo $LOCAL | sed 's_/c_C:_'`\" \"`echo $REMOTE | sed 's_/c_C:_'`\" \"`echo $BASE | sed 's_/c_C:_'`\" \"`echo $MERGED | sed 's_/c_C:_'`\" | |
trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment