search

Murmele / Gittyup

Understand your Git history!
https://murmele.github.io/Gittyup
MIT License
1.37k stars 107 forks source link

External diff with file on disk #663

Open cdannebe opened 7 months ago

cdannebe commented 7 months ago

It would be nice to have the possibility to run an external diff between selected file (in tree view or double tree view) and the version in current working directory.

Or, external diff between two commits of a file in different branches.

Thanks for you great work!

Murmele commented 7 months ago

If you select two commits and rightclick on the file you can do an external commit. Is this what you want?

cdannebe commented 7 months ago

Hi Murmele, thanks great to know, I never tried this. This is 80% what I want. The rest of 20% is the diff with the version in the current working directory.

Thanks for your work on Gittyup, Christian.

Murmele commented 7 months ago

As a workaround you have to commit and then doing the diff :)

cdannebe commented 7 months ago

Yes, I understand ;-)

cdannebe commented 7 months ago

Commiting and doing the diff is only possible if I want to have the current changes in my repo. Otherwise I had to crate a separate branch, commit and doing the diff. Hmm...

Murmele commented 7 months ago

Yes currently this is the only possibility. I would commit and then reset Mixed to get the workdir changes back