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?
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 was in the same situation until like a year ago. I can recomend browsing through the documentation!
I mostly use
:G
as an interactivegit status
,:Git difftool -y
to look through my changes before commiting and:Gdiffsplit
to diff the current file. Also instead of doing e.g.:!git pull
I’d do:Git pull
and 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.