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?

  • zygo_histo_morpheusEnglish
    5·
    1 year ago

    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 -y when I wanna go through the diffs

    • Jason NovingerMEnglish
      2·
      1 year ago

      Honestly, 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.

      • zygo_histo_morpheusEnglish
        3·
        1 year ago

        I was in the same situation until like a year ago. I can recomend browsing through the documentation!

        I mostly use :G as an interactive git 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.