![]() " 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. 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 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |