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

Git

2937 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 2 years ago
MODERATORS
Ategon
canpolat
jnovinger
5
git difftool (self.git)
submitted 2 years 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
[–] NostraDavid 3 points 2 years ago

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.