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.

Sign up for GitHub

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

Jump to bottom

Improve Stashs #615

Merged
merged 2 commits into from
Mar 5, 2017
Merged

Improve Stashs #615

merged 2 commits into from
Mar 5, 2017

Conversation

stoivo
Copy link
Member

@stoivo stoivo commented Mar 4, 2017

Fix: Trigger stash command outside of stash section
fixes #600

Fix: Drop a stash is destructive
fix #609

asfaltboy
asfaltboy requested changes Mar 4, 2017
View reviewed changes
Copy link
Member

@asfaltboy asfaltboy left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Why do we need c868190? Shouldn't we always limit context of an action that requires a stash as target?

@stoivo
Copy link
Member Author

stoivo commented Mar 4, 2017

As reasoned in #600 when hitting t + a and did not move the cursion to a stash, it would only stage all files. Doing the action is was the keyboard shortcut a.

asfaltboy
asfaltboy approved these changes Mar 4, 2017
View reviewed changes
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.

I think I got it, better to catch the t,a than to pass

@divmain
Copy link
Collaborator

divmain commented Mar 5, 2017

This was a very precise change, I expected it to be a bit uglier. Nice work!

@divmain divmain merged commit f495173 into timbrel:master Mar 5, 2017
@stoivo stoivo deleted the stash branch March 11, 2017 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asfaltboy asfaltboy asfaltboy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Enhancement: Ask confirmation for "discard stash" action Erratic behavior of stash commands in git: status
3 participants
@stoivo @divmain @asfaltboy