About
JuxtaCode lets you browse commits, compare any two commits or branches side by side, and follow a file's complete history, even when it has been renamed or moved. Its sidebar timeline shows fully expanded changesets with syntax highlighting, and you can search commits by message, hash, branch, or tag, then filter files by name, type, or kind of change.
When a merge conflict arises, JuxtaCode labels the commits on each side so you can trace the changes that caused it before choosing a resolution. Its three-way merge tool keeps line-level changes visible as the result grows and shrinks, and word differences update as you type. You can also launch diffs and merges from Terminal with the juxta command-line tool or drive JuxtaCode from Git clients such as Tower, Gitfox, and Fork. The same tools work with any plain text, even outside a Git repository, and version 1.5 adds export of comparisons as PDF or PNG.
JuxtaCode is available as a free 14-day trial, with a one-time purchase and no subscription, from the Mac App Store or the developer's website.
What's new
All release notesHomebrew cask juxtacode 1.5 (sha256 073664f9d96a5786d2d1a1e2ea0d377afaef4171a956bc927b3211b9a3fcb079).