So, following the instructions here http://www.scootersoftware.com/suppo...vcs#gitwindows I can invoke get diffs via git difftool and git difftool -d
BUT (big but) the experience is pretty awful for the thing I do most often - eyeballing/fixing pre-commit.
git difftool" is useless for any but the smallest changes - the app pops up a new window for each file and there's no navigation.
"git difftool -d" looks a bit better - but there's no way to edit the local files (they're temp files). Even running with --symlinks as admin didn't seem to do anything different (maybe I'm doing something wrong here?, if the right pane was local files, this wouldn't be bad).
Something close to bc patch mode would be ideal, alas git diff | BCompare.exe - /fv="Text Patch" gives "File not found stdin://". Of course I can git diff to a temp file and open that, but again, I would be left editing temp files instead of the originals.
How can we get a better out of the box experience? I don't think we should need to reinvent the wheel here with auxiliary scripts etc. If git can't be taught to do it, then perhaps bc can instead? Something like
bdiff git <folder> (which would do the pseudo command "git diff <folder> | bcompare --patch-mode --rhs=<folder>")
Even better if it could detect the source control system "bdiff ."
Stephen.
BUT (big but) the experience is pretty awful for the thing I do most often - eyeballing/fixing pre-commit.
git difftool" is useless for any but the smallest changes - the app pops up a new window for each file and there's no navigation.
"git difftool -d" looks a bit better - but there's no way to edit the local files (they're temp files). Even running with --symlinks as admin didn't seem to do anything different (maybe I'm doing something wrong here?, if the right pane was local files, this wouldn't be bad).
Something close to bc patch mode would be ideal, alas git diff | BCompare.exe - /fv="Text Patch" gives "File not found stdin://". Of course I can git diff to a temp file and open that, but again, I would be left editing temp files instead of the originals.
How can we get a better out of the box experience? I don't think we should need to reinvent the wheel here with auxiliary scripts etc. If git can't be taught to do it, then perhaps bc can instead? Something like
bdiff git <folder> (which would do the pseudo command "git diff <folder> | bcompare --patch-mode --rhs=<folder>")
Even better if it could detect the source control system "bdiff ."
Stephen.
Comment