Posts From Category: git

[diff]
        tool = BCompare
[difftool]
        prompt = true
[difftool "BCompare"]
        path = "/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe"
        cmd = "/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe"  "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"                                                                                                                          [merge]
        tool = BCompare
[mergetool "BCompare"]
        path = "/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe"
        cmd = "/c/Program\\ Files/Beyond\\ Compare\\ 4/bcomp.exe" "$(wslpath -aw $BASE)" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $MERGED)"

[alias]
        review = "!sha=$1; git status; b() { total=$(git diff | wc -l); if [ $total -eq \"0\" ]; then git diffdir --cached; else git diffdir; fi; }; s() { git diffdir $sha^ $sha; }; r() { if [ -z \"$1\" ]; then b; else s; fi; }; r"
        diffdir = difftool --dir-dif --no-symlinks

touch tmp.txt
git add .
git review
git commit -am "tmp"
git review HEAD