search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.49k stars 1.25k forks source link

Support difftastic for diff viewing #811

Open ceddlyburge opened 2 years ago

ceddlyburge commented 2 years ago

Hi There, I'm using GitUp and its great. I love the keyboard shortcuts. You get the speed of the command line (or better) and much better visualisations.

Anyway, I've started using Difftastic on the command line, which is also excellent, and I'm wondering if there could be an option to use it?

There are already some promising looking options in the Advanced tab of the preferences ...

Thanks, Cedd

lucasderraugh commented 2 years ago

There is an option to use the same tool configured in the git CLI (might be called difftool). Does selecting that option work for you? Sometimes there are custom configurations that are required but we'd like to avoid them if possible.

ceddlyburge commented 2 years ago

Thanks Lucas. Is this the "External Diff: ", "Git Tool" option?

lucasderraugh commented 2 years ago

That would be it, any luck?

ceddlyburge commented 2 years ago

Hi Lucas, that isn't doing what I was hoping, but maybe I have set things up wrong.

The output in GitUp is different to the output when I do git diff on the command line.

I assume that I would expect it to be the same (when using the "External Diff: ", "Git Tool" option)?

Thanks, Cedd

lucasderraugh commented 2 years ago

Ah, you mean for regular diff viewing and not for conflict resolution. I'd have to look into it more.