News for hackers. Stuff that matters.

Show HN: JuxtaCode – native Git diff tool for macOS

https://juxtacode.app

I wanted to make a native Git diff tool that works "stand-alone" in the sense that you just need to point it at a repository and then you can select commits to compare and open files in a 3-way-merge tool.

I've been finding it useful to have one app I can quickly switch to for comparing branches and sorting out merge conflicts.

( 6 comments | 2 points | on HN )
Re:Show HN: JuxtaCode – native Git diff tool for macOS by swah on Friday June 02, 2023 @05:08AM (#36162892)
Can you also diff two files outside of git?
Re:Show HN: JuxtaCode – native Git diff tool for macOS by yorim on Friday June 02, 2023 @05:22AM (#36162973)
Not yet. Definitely on my todo list, but for now focusing on getting things working correctly when using Git.
Re:Show HN: JuxtaCode – native Git diff tool for macOS by iraizo on Friday June 02, 2023 @05:20AM (#36162956)
looks nice, just something i wouldn't use if i can't use it on any other OS. Wouldn't want to split my toolchain across different OS
Re:Show HN: JuxtaCode – native Git diff tool for macOS by monkey_monkey on Friday June 02, 2023 @06:35AM (#36163423)
What's the post-beta pricing going to be?
Re:Show HN: JuxtaCode – native Git diff tool for macOS by KMnO4 on Friday June 02, 2023 @06:45AM (#36163473)
Looks like this uses the ours/theirs terminology. I really dislike that and it’s the main reason I ended up abandoning Sublime Merge. It just doesn’t make sense to me and the definition of ours/theirs seems to switch depending on which command you’re running.
Re:Show HN: JuxtaCode – native Git diff tool for macOS by yorim on Friday June 02, 2023 @06:57AM (#36163548)
Even having worked on JuxtaCode, I have to stop and think about how each term applies depending on the situation. But I find that by sprinkling "Ours" and "Theirs" badges throughout the UI, including the commit graph, it helps me keep track of what each term means in the current context. But I get that might not do it for everyone.