![]() Thatâs all you need to be good to go! Much simpler than bothering with all those wrappers. ![]() Now all calls to git difftool and git mergetool should default to KDiff3. Path = C:/Program Files/KDiff3/kdiff3.exe The possible options are: no - Show no untracked files. It is optional: it defaults to all, and if specified, it must be stuck to the option (e.g. gitconfig (in your home directory, C:\Users\(username), or down ye olde Documents and Settings path), and add the following: The mode parameter is used to specify the handling of untracked files. The following commands are run from a cygwin bash shell window. Itâs not the prettiest GUI in the world, but once you get used to it it is quite usable and has the added advantage of working quite naturally with Git without having to configure much. Git Under Cygwin or Git Bash Shell - SourceGear DiffMerge Git Under Cygwin or Git Bash Shell The following instructions are for the version of GIT included with Cygwin or the default Git Bash Shell. I thought Iâd share it in the event you just want to get something up and running as fast as possible, and that you arenât too particular about which diff tool you use.įirst step, install KDiff3. ![]() ![]() These posts cover how to write wrapper scripts around your diff and merge tool of choice (I was using DiffMerge at the time) and get Git to use them. git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. Iâve noticed a fair number of people are looking at my older posts on setting up diff and merge tools and the update on configuring git difftool. ![]()
0 Comments
Leave a Reply. |