Usegit status(at the root) to list all the files not currently undergit's control. This will pretty much be everything at this point. Revisit previous step if you see something you don't want or be careful in the next step. Usegit addto stage what you wantgitto control. For example...
#!/usr/bin/perl -w use strict; use warnings; use Sys::Hostname; my $h=hostname(); @ARGV=qw(host1 host2 host3 host4) unless @ARGV; print join " ", qw(gvimdiff), $ENV{HOME}.'/.var/redit/'.$h, map {'scp://'.$_.'/.var/redit/'.$_} grep {$_ ne...
Since Git version 1.6.3 there is "git difftool" which you can configure to use your favorite graphical diff tool. Currently supported (at the time of writing this answer) out-of-the-box are KDiff3, Kompare, tkdiff, Meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, Diffuse a...
The command doesn't necessarily open a GUI unless you install one. Runninggit mergetoolfor me resulted invimdiffbeing used. You can install one of the following tools to use it instead:meld,opendiff,kdiff3,tkdiff,xxdiff,tortoisemerge,gvimdiff,diffuse,ecmerge,p4merge,araxis,vimdiff,emerge. Below...
I use homebrew's version of Vim and can tell that its scrolling is quite fast (at least there's no slowness) both in Terminal and in iTerm2. Hence, a few suggestions that logically follows: Try changing either Vim or terminal (or both). Try using GUI version ...
gvimdiff3 kdiff3 meld ... Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail. Then we should install kdiff3, there are many ways to do it: by using MacPort by using Homebrew by downloading SourceForge dmg package ...
opendiff, kdiff3, tkdiff, xxdiff, meld, compare, gvimdiff, diffuse, diffmerge, ecmerge, p4merge, araxis, bc, codecompare, smerge, emerge, vimdiff, nvimdiff. To configure a graphicaldifftoolin your Git configuration, install the chosen difftool and then configure Git to use it. For example...
I also use X11 (XQuartz) all day as well as terminal sessions, with various Linux, Solaris, AIX X11 displays being sent back to my iMac at work, frequently using gvimdiff. Reply User profile for user: richard3 richard3 User level: Level 2 305 points Nov 30, 2014 7:34 PM in ...
C:\Users\%user%\AppData\Local\GitHubDesktop\app-1.1.0\resources\app\git\mingw64\libexec\git-core\mergetools\examdiff C:\Users\%user%\AppData\Local\GitHubDesktop\app-1.1.0\resources\app\git\mingw64\libexec\git-core\mergetools\gvimdiff ...
If anyone wants to use gvim as their diff tool on TortoiseGit, then this is what you need to enter into the text input for the path to the external diff tool: path\to\gvim.exe -f -d -c "wincmd R" -c "wincmd R" -c "wincmd h" -c "wincmd J" Share Improve this answer ...