Path old-file old-hex old-mode new-file new-hex new-mode copy %TEMP%\%~nx2 %GIT_DIFF_OLD_FILES%\%1 copy %5 %GIT_DIFF_NEW_FILES% :END Goto END ) REM diff is called by git with 7 parameters: REM "%ProgramFiles(x86)%\WinMerge\WinMergeU.exe" -r -e -dl "Local" -dr "Remote" %TEMP%\GitDiff\old %TEMP%\GitDiff\new "%ProgramFiles%\Beyond Compare 2\BC2.exe" %TEMP%\GitDiff\old %TEMP%\GitDiff\new Set GIT_FOLDER_DIFF="%ProgramFiles%\Beyond Compare 2\BC2.exe" If exist "%ProgramFiles%\Beyond Compare 2\BC2.exe" ( %GIT_FOLDER_DIFF% %TEMP%\GitDiff\old %TEMP%\GitDiff\new REM This command using GIT_FOLDER_DIFF just does not work for some reason. Set GIT_DIFF_NEW_FILES=%TEMP%\GitDiff\newĮcho Please wait and press q when you see "(END)" printed in reverse color.
Set GIT_DIFF_OLD_FILES=%TEMP%\GitDiff\old
REM being called directly, or inside git diff REM This batch file will be called by git diff. Goto END ) if "%GIT_DIFF_COPY_FILES%"="" (
Echo GitDiff - enables diffing of file lists, instead of having to seriallyĮcho diff files without being able to go back to a previous file.Įcho Command-line options are passed through to git diff.Įcho If GIT_FOLDER_DIFF is set, it is used to diff the file lists.
0 kommentar(er)
