I've just started using Git and it's possible I've missed something obvious, but here goes:
- I'm using msysgit 1.6.2.2 on Windows XP
- While installing, I picked option 1 to "Use Git Bash only"
I'm trying to put together a wrapper script that I can use to replace the built in git diff with DiffMerge. Based on this thread on SO, I created the following batch file:
@echo off
REM ---- Switch forward slashes to back slashes ----
set oldW=%2
set oldW=%oldW:/=\%
set newW=%5
set newW=%newW:/=\%
REM ---- Launch DiffMerge ----
"C:/Programs/SourceGear/DiffMerge/DiffMerge.exe" /title1="Old Version" %oldW% /title2="New Version" %newW%
I placed the bat file under %GIT_INSTALL%/cmd and edited my .gitconfig file as follows:
[diff]
external = C:/Programs/git/cmd/git-diff-wrapper.bat
If i launch Git Bash and execute git diff HEAD HEAD~ -- myfile
I get a message File (\dev\null) not found
- which given I'm on Windows is not surprising.
Pressing on, I launched gitk and under Edit>Preferences, I chose the same wrapper script. Trying the "external diff" option for a particular file gives the cryptic error message Unknown Option "
Clearly, I have no idea what I'm doing anymore so any help would be much appreciated.