Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable mergetool.cmd. Otherwise, git mergetool assumes the tool is available in PATH. For example, you can configure the absolute path to kdiff3 by setting. You can explicitly provide a full path to the tool by setting the configuration variable mergetool.path. If the configuration variable merge.tool is not set, git mergetool will pick a suitable default. If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis. Similarly, if you don't need to refresh the workspace after the launcher completes, you can disable that in the 'Refresh' tab.-t, -tool= Use the merge resolution program specified by. For example, if you don't need to build the project before launching (as you wouldn't for difftool), you can turn that off in the 'Build' tab. There are sone other options in the external launchers that can be used to optimize the behavior a little. To share just add, commit and push as usual. The new launcher will now show up as an untracked file. For the value choose any directory you like in your project, or make a new one and use that. Do this in Preferences -> Run/Debug/String Substitution.ġ) Open "External Tools Configuration." from the External Tools toolbar itemģ) For the Location value use $ĥ) For the Arguments, provide the Git command-line argument(s), eg 'difftool' (without the quotes of course)Ħ) For the Name use whatever you like, eg Git difftoolħ) To share this launcher, click the 'Common' tab, then the 'Shared FIle' radio button. This will allow you to share the launcher by saving it as a part of the repository without making any assumptions about where each developer has command-line Git installed. Proceed with an external launcher you mean? That's pretty easy:Īs a preliminary I recommend defining a String Substitution variable called 'git_exec', where the value is the path you your Git executable. gitconfig for quite a few diff/merge tools, except emerge, kompare, vimdiff. Ma Thomas wrote on Tue, 17 April 2012 23:01 External option sounds great. Path = "c:/lang/tools/diff_merge/perforce/p4merge.exe"Ĭmd = "\"c:/lang/tools/diff_merge/windiff/windiff.exe\" \"$LOCAL\" \"$REMOTE\"" Path = "c:/lang/tools/diff_merge/KDiff3/kdiff3.exe" Path = "c:/lang/tools/diff_merge/ecmerge/ecmerge.exe" Path = "c:/lang/tools/diff_merge/bc3/bcomp.exe"Ĭmd = "\"c:/lang/tools/diff_merge/diffmerge/sgdm.exe\" \"$LOCAL\" \"$REMOTE\""
0 Comments
Leave a Reply. |