this post was submitted on 21 Jun 2023
5 points (100.0% liked)

Git

2905 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
Ategon
canpolat
jnovinger
5
git difftool (self.git)
submitted 1 year ago by canpolat to c/git
14 comments fedilink hide all child comments
 

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?

you are viewing a single comment's thread
view the rest of the comments
[–] zygo_histo_morpheus 5 points 1 year ago (1 children)

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

[–] jnovinger 2 points 1 year ago (1 children)

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_morpheus 3 points 1 year ago (1 children)

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.

[–] jnovinger 2 points 1 year ago

Thanks for the pointers, I'll try to start using it more.