-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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 fixup/squash keybindings when at blame window #1378
base: master
Are you sure you want to change the base?
Conversation
There is also cF and cS – any reason to skip them? |
If we do this, it should be all commit maps, and then the docs can just link to Calling |
Thanks @odnoletkov, @tpope for getting back to me. I've updated the pull request to add I noticed that Another mapping that doesn't seem to work is
Hmm, there are a few possible way I can think of to avoid that:
I've updated the PR to implement (1) for now. Thoughts? |
b38d08f
to
353ed30
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think merge mappings are quite different from the rest of commit maps so it doesn't make much sense to include them too
@@ -89,6 +89,17 @@ that are part of Git repositories). | |||
- reblame at commit | |||
~ reblame at [count]th first grandparent | |||
P reblame at [count]th parent (like HEAD^[count]) | |||
cf create a `fixup!` commit for the commit under |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With commits maps unified there is no need to provide separate help for the blame window
I don't know how this happened. Did the
It's for symmetry with the other
Best would be (2). Doesn't need to be buggy; something similar to I'm also fine to ignore it for now if you leave out the explicit documentation. |
353ed30
to
6989367
Compare
This allows you to use the the keybinding
cf
,cs
,cA
to create a fixup/squash commits for the selected line in:Gblame
window, with similar semantic to:Gstatus
window.I find this very useful because a lot of the time the lines around the lines you are fixing up often were modified in the commit that you want to update.