search

sindrets / diffview.nvim

Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
Other
3.57k stars 101 forks source link

[Feature request] git rebase --continue workflow #505

Closed lobneroO closed 1 month ago

lobneroO commented 1 month ago

Description

It would be nice to have an integrated workflow for stage+commit+git rebase --continue I just went through a rebase with closing, continuing and reopening diffview three times, and while I probably didn't do it optimally, I didn't see a way to handle it all from within diffview. The staging is part of diffview (and committing as well, I think?), but the rebase continue is not so far as I can tell.

Expected behavior

No response

Actual behavior

Have a shortcut that lets you easily do git rebase --continue without leaving diffview

Steps to reproduce

  1. Start a rebase which will have to be continued at least once
  2. Open nvim with diffview
  3. Merge changes for the first rebase step
  4. Stage and commit
  5. Do an extra git rebase --continue outside of diffview
  6. Go back into diffview

Health check

Not needed for feature request

Log info

Relevant info from :DiffviewLog ``` ############################ ### PUT LOG CONTENT HERE ### ############################ ```

Neovim version

NVIM v0.10.0

Operating system and version

All of them

Minimal config

No response

lobneroO commented 1 month ago

Sorry about the bug label. I couldn't see a way create this as a feature request for some reason

sindrets commented 1 month ago

The staging is part of diffview (and committing as well, I think?)

Committing is intentionally not, no.

The following section in that document should also tell you how you can set up some mappings to call git rebase --continue in whatever fashion best suites your config.

sindrets commented 1 month ago

Example from my own config: https://github.com/sindrets/dotfiles/blob/40e20f7f68cf55f175d94a92b31a64d66ed3c059/.config/nvim/lua/user/plugins/diffview.lua#L107