Step 1 - Create a file named winmerge.sh at a location accessible to your path (such as /home/bin/winmerge.sh) with following contents. Since the thread is getting confusing and bifurcated, here are consolidated instructions for the Directory Listing "-dir-diff" WinMerge method for msysgit Git Windows. You can click on the ones you want to examines, then a simple ESC will close the all WinMerge-diff session. Here only one WinMerge will open up, with the list of files having internal differences. It is not robust enough to handle files with same names in different directories, but it gives you a general idea of what is possible: REM path old-file old-hex old-mode new-file new-hex new-modeĬopy %TEMP%\%~nx2 %GIT_DIFF_OLD_FILES%\%1 REM diff is called by git with 7 parameters: "%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. I have tweaked it to use only DOS commands offĮcho 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. That is why I like the approach of GitDiff.bat - power-diffing with GI, which allows you to review the list of files with a difference, before selecting one to examine its internal differences.
WINMERGE GIT KRAKEN WINDOWS
Git diff -name-only | while read filename doīut that only works by opening n windows for n files (if you try to use the -s option of WinMerge, it will not work because of the temp files being deleted by the difftool too early) Original difftool by directories script (December 2009)Īs Seba Illingworth mentions in his answer, a script git-diffall.sh (also put in the path) can do just that: #!/bin/sh
WINMERGE GIT KRAKEN PATCH
See " Patch difftool: teach difftool to handle directory diffs", and the answer " Directory comparison of Git branches" for more details. " git difftool" learned the " -dir-diff" option to spawn external diff tools that can compare two directory hierarchies at a time after populating two temporary directories, instead of running an instance of the external tool once per a file pair.
WINMERGE GIT KRAKEN UPDATE
Update June 2012 (2-and-a-half years later):Ĭomparing directories instead of file-by-file will be available soon: If you want git diff to launch WinMerge, just set: set GIT_EXTERNAL_DIFF=winmerge.shīut the real added value comes from the ability to use that same diff tool to present all differences in one batch instead of presenting them sequentially, forcing you to close the diff tool windows one file at a time. (see WinMerge Command-line options) git difftool "$PROGRAMFILES/WinMerge/WinMergeU.exe" -e -u -dl "Local" -dr "Remote" "$1" "$2" With winmerge.sh stored in a directory part of your PATH: #!/bin/sh The first part (using winmerge) is described in " How do I view ‘git diff’ output with visual diff program?" C:\myGitRepo>git config -replace -global diff.tool winmergeĬ:\myGitRepo>git config -replace -global "winmerge.sh \"$LOCAL\" \"$REMOTE\""Ĭ:\myGitRepo>git config -replace -global difftool.prompt false
Git 2.5+ (Q2, 2015) is now aware of Winmerge as a diff or merge tool! As detailed in " git mergetool winmerge", a simple git config diff.tool winmerge will be enough.
0 kommentar(er)
