{{ message }}
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Discard lines in file diff#487
Merged
Merged
Conversation
BinaryMuse
approved these changes
Jan 27, 2017
... in order to minimize accidentally selecting it per #481 (comment)
Contributor
|
from some adhoc testing, I found a edge case.
Expected: Shouldn't have the ability to Actual: |
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


Fixes #50.
Fixes #481.
This PR implements discarding hunk lines via a
Discard Selectioncontext menu option and allows users to undo discard actions. This option is in a separate context menu section to reduce the possibility of accidentally selecting it, per #481 (comment).You can undo discards via the
Undo Last Discardbutton (see below), keybindingcmd-z, or commandgithub:undo-last-file-diff-discard.The undo action will fail if the text buffer is modified, or if the file has been changed since the discard action.
Additionally, this PR introduces a new file diff header bar that displays the corresponding file name and staging status, and has buttons for opening the file in an editor and viewing the corresponding staged/unstaged version of the file if one exists.
TODO: