Here’s the Deal
Slant is powered by a community that helps you make informed decisions. Tell us what you’re passionate about to get your personalized feed and help others.
In Magit staging a hunk or even just part of a hunk is very easy. Magit also implements several other "apply variants" in addition to staging and unstaging. For example: you can also discard or reverse a change, or apply it to the working tree. See More
BeyondCompare is my go to Diff/Merge tool. It run on Mac, Linux, Windows and, it integrates with Visual Studio & Visual Studio Code and Git. Fantastic tool that I've been using for over a decade. It is also GREAT for resolving folder differences and for comparing a myriad of other things, e.g. data. See More
So parts you don't want to see in your comparision can be hidden with ignore masks. Parts that are okay to be changed can be set with change-lists so beyond compare knows what's the replacement value and skips displaying this. So you can focus on the for you important changes. For example with the ignore mask I was able to compare two logs with different timestamps but nearly same content. (beginning with timestams the first x characters adding to ignore) See More