Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: disable "reset line" and "reset hunk" in inline diff cached mode #724

Merged
merged 1 commit into from
Jul 27, 2017

Conversation

randy3k
Copy link
Collaborator

@randy3k randy3k commented Jul 27, 2017

The concept of reseting lines an hunks in cached mode is confusing. What it does now is exactly equal to unstaging lines or hunks. So, "l" and "L" (also "h" and "H") are doing the same task in the cached mode. This PR disables the "reset" keys "H" and "L" in the cached mode.

We actually also disabled "reset hunk" for the diff view, so it does also make sense to disable it for the inline diff view.


The maintainers of this repo require that all pull request submitters agree and adhere to the following:

  • I have read and agree to the contribution guidelines.
    (required)
  • All related documentation has been updated to reflect the changes made. (required)
  • My commit messages are cleaned up and ready to merge. (required)

The maintainers of this repository require you to select the semantic version type that
the changes in this pull request represent. Please select one of the following:

  • major
  • minor
  • patch
  • documentation only

@maintainerd
Copy link

maintainerd bot commented Jul 27, 2017

maintainerd logging is enabled for this repository.

All actions related to rules and their enforcement will be logged here as a permanent record.


Click to view log...

  • 2017-07-27T04:59:30.841Z:a7ae722: The pull request was created
  • 2017-07-27T04:59:37.231Z:a7ae722: @randy3k checked I have read and agree to the [contribution guidelines](https://github.com/divmain/GitSavvy/blob/master/CONTRIBUTING.md)..
  • 2017-07-27T04:59:37.709Z:a7ae722: @randy3k checked All related documentation has been updated to reflect the changes made. _(required)_.
  • 2017-07-27T04:59:38.471Z:a7ae722: @randy3k checked My commit messages are cleaned up and ready to merge. _(required)_.
  • 2017-07-27T04:59:41.493Z:a7ae722: @randy3k selected patch as the semantic version.

@randy3k randy3k force-pushed the randy3k/in_diff_view branch 2 times, most recently from 977f81a to 3fddccd Compare July 27, 2017 05:08
@randy3k randy3k changed the title Enhancement: disable "reset line" and "reset hunk" in cached mode Enhancement: disable "reset line" and "reset hunk" in inline diff cached mode Jul 27, 2017
Copy link
Member

@asfaltboy asfaltboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to clarify, the current behavior of the keys on a cached file for H == h and l == L yes? And we want to clear the dupe, rather than adding "reset" functionality to a staged file?

If so, the change looks clear.

@randy3k
Copy link
Collaborator Author

randy3k commented Jul 27, 2017

Yes, you are right.

@asfaltboy asfaltboy merged commit b4ed30c into master Jul 27, 2017
@randy3k randy3k deleted the randy3k/in_diff_view branch July 27, 2017 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants