Add ability to revert single files/hunks/lines about sublime_merge HOT 7 CLOSED

Reversing/reverting hunks and selected lines are the only features keeping me from switching from SourceTree.

from sublime_merge.

This has been added in dev build 2024!

from sublime_merge.

Here's a way to at least check out files:

[
    { "caption": "-" },
    {
        "caption": "Reset file to this version",
        "command": "git",
        "args": {"argv": ["checkout", "$commit", "$path"]}
    }
]

Save in your user folder as File.sublime-menu.

from sublime_merge.

Isn't this usually a problem of having committed unrelated changes within the same commit previously? If a hunk could work on it's own it should have been committed as a single commit in the first place... While it may come in handy, it may promote not committing atomic changes.

If you need to revert a hunk, you should probably revert the complete commit without yet committing it, then only stage the hunks that need to be reverted, commit, then discard the rest.

So I think it could be useful to have a context menu item "Revert without committing" aka git revert --no-commit. That way, you could either squash multiple reverts into one, or stage just one reverting hunk and discard the rest.

from sublime_merge.

Isn't this usually a problem of having committed unrelated changes within the same commit previously?

No. What if you made a fix for an issue which containes many code lines. During review another guy finds a regression in maybe one or two lines, which he wants to revert.

This might not be an everyday scenario, but I was sometimes faced to it here and there.

If you need to revert a hunk, you should probably revert the complete commit without yet committing it, then only stage the hunks that need to be reverted, commit, then discard the rest.

1. Of course, you can always take the long way - or the sublime one.
2. This PR was made with the functionality of GitExtensions in mind and to make all git related functions (stash,stage,revert) work the same way on all pieces of code.

from sublime_merge.

Workaround for reverse hunk:
https://forum.sublimetext.com/t/reverse-hunk-workaround/44645

from sublime_merge.

Nice job.

from sublime_merge.