Your comments

I'm on 18.1.4 #12159, installed: #12086. Interestingly enough, when I do Help > "Check For Latest Build" it tells me I have the latest version. Hmm... another bug perhaps?


I just downloaded 18.2 from the Syntevo website, and it still has the same problem on exactly the same commits. Would you like a video or something showing the issue?

This is all subjective, but my suggestion would be something similar to what you have now but with more contrast and possibly a "+" next to it to indicate additional changes beyond what is staged. 


Here's a rough mockup:


Thomas, while the other request you mentioned may be a "more general request", the workflow would be quite different. I think what people are asking for in this request is the ability to select a stash under the 'Stashes' section of the 'Branches' pane and choose something like an 'apply subset' option which would open a dialog in which specific files could be selected for application.


This is a quite different workflow from the other request, which would require:

  1. opening the log window and finding the stash in the log
  2. for each of the (up to) 3 sub-commits of the stash  (1 for each of untracked files, index, and workspace changes):
    • select the individual files
    • right-click and cherrypick
    • resolve conflicts


Note: there is an open request to allow interactive staging when the "compact changes display" mode is active. IMO this is a necessary improvement in order to allow compact changes view to be useful in daily workflow. If you agree, please vote for it.


https://smartgit.userecho.com/communities/1/topics/615-changes-view-allow-stagingunstaging-in-compact-changes-display-too

As a matter of fact I find that I always want the 'Compare Before' option.
Not sure when I would use the 'Compare After' option.

Interesting. When comparing a file from a commit (or stash) in the log to my working tree, I almost always do the opposite -- I "Compare After" the committed file changes versus the working tree, because I want to diff the state of the file after the commit versus the current working tree state.


I agree however that if you select multiple files, the dialog should open just once and the choice should apply to all the files selected