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

Add g to toggle between staging and workdir (workarea) #595

Merged
merged 6 commits into from
Mar 21, 2021

Conversation

terhechte
Copy link
Contributor

@terhechte terhechte commented Mar 20, 2021

As discussed in #594 This adds g to toggle between staging and workdir. Needed to find a good term, went with work area which would be either staging or workdir. Open for suggestions :)

Note that the vim key config uses w instead of g as that (kinda) matches the vim w for moving between windows. Whereas g in vim can be used for jumping to the top. This isn't used yet but I'd love to add it here in the future.

…f` is not selected as a `const fn` by clippy
Copy link
Owner

@extrawurst extrawurst left a comment

Choose a reason for hiding this comment

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

added a few comments.

src/tabs/status.rs Outdated Show resolved Hide resolved
src/strings.rs Outdated Show resolved Hide resolved
src/tabs/status.rs Show resolved Hide resolved
@extrawurst
Copy link
Owner

how about using w in regular key bindings aswell, now that we have not strong reason to use g anyway?

@terhechte
Copy link
Contributor Author

Good Point ☺️

@extrawurst extrawurst merged commit 656561e into extrawurst:master Mar 21, 2021
@savchenko
Copy link

Would it make sense to allow w from the Diff view as well?
It currently does nothing and the only way to switch back is via .

@extrawurst
Copy link
Owner

I do not think this would we intuitive. I prefer the current situation where you always go back and forth with left/right between the file and the matching diff of that file

extrawurst pushed a commit that referenced this pull request May 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants