Which difftool do you use and why? I develop on Windows and I use KDiff3. It has worked flawlessly all these years. And just because of that I haven’t really followed what else is out there. I suspect I’m in the minority?
I’ve been using GitLens by gitkracken here lately with VS Code.
I’ve been using BeyondCompare for ages.
I’m a vim user so naturally I use vim. I have the fugitive plugin which is a relatively thin wrapper around git commands and mostly run
:Git difftool -ywhen I wanna go through the diffsHonestly, this should have been my answer. I’m a vim person and I have fugitive installed, I’ve just never taken the time to learn how to use it fully.
I was in the same situation until like a year ago. I can recomend browsing through the documentation!
I mostly use
:Gas an interactivegit status,:Git difftool -yto look through my changes before commiting and:Gdiffsplitto diff the current file. Also instead of doing e.g.:!git pullI’d do:Git pulland so on. It’s nice because most commands are just the same as on the command line, so the knowledge is mostly transferable, but doing them in vim requires less context switching.Thanks for the pointers, I’ll try to start using it more.
For terminal, I use delta - it provides nice visual deltas.
For GUI I just use vscode. Select file 1, ctrl-LMB file 2, RMB on file 2 -> compare files.
If, for some reason, I have to compare whole folders (at least on windows), I’ll use WinMerge (it can also compare folders to globally check for file differences, without going directly into specific changes) for folder and files comparisons.
