Skip to content

Why to (not) use –dir-diff with git difftool?

  • Florian 
  • 9 min read

The topic of today sounds pretty technical, but it is one that has a great impact on your work, if you are a developer using Git. This post outlines two fundamentally different methods for examining Git changes with Kaleidoscope. An appendix illustrates how to combine your Git app of choice with either method.

Folder Comparison Reinvented

  • Florian 
  • 9 min read

Recently, we have spent a lot of time on many aspects of the folder comparison feature for Kaleidoscope 4.4 and 4.5. We have overhauled some of the underpinnings and worked hard to improve reliability and speed. But we also added some major new features. It’s time to tell you a bit what they are and how you can benefit from those changes.

Conquer multi-file comparisons – Kaleidoscope File Shelf, Part 1

  • Florian 
  • 7 min read

You might never have noticed that Kaleidoscope has a thing called File Shelf. In this two-part series, we’ll show how you can use it, including some advanced examples.

Part 1 explains how to conquer multi-file comparisons using the File Shelf and the Navigation menu.

The Cure for Merge Madness

  • catlan 
  • 5 min read

Following the addition of Git File History in Kaleidoscope 4.1, in this latest update we wanted to tackle merge conflicts by adding more context provided by Git. New tools enable you to understand conflicts better and thus resolve them faster.

Kaleidoscope 4.1 and Git

  • Florian 
  • 6 min read

With the first major update to Kaleidoscope 4, we are entering completely new territory: Kaleidoscope can now directly talk to Git. While Kaleidoscope could always integrate with Git, until now it could only show the results of a Git operation, such as git difftool and git mergetool, which was typically initiated through a Git client like Tower. For the 4.1 update, we decided to focus on the ability to display and compare multiple revisions of a file.