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

feat: added rebase interactive #319

Merged
merged 1 commit into from
Jul 21, 2022

Conversation

kessejones
Copy link
Contributor

adds the possibility to perform interactive rebase

@kessejones
Copy link
Contributor Author

@sotte

@sotte
Copy link
Contributor

sotte commented Jul 19, 2022

I'll test it out during the next rebase. Thanks @kessejones.

Copy link
Collaborator

@TimUntersberger TimUntersberger left a comment

Choose a reason for hiding this comment

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

What is the neovim RPC for? Is it just for testing?

Also please fix the linting errors.

Thank you!

lua/neogit/lib/rpc.lua Outdated Show resolved Hide resolved
@kessejones
Copy link
Contributor Author

About neovim RPC

It is being used to communicate with the neovim process started by running git rebase -i.
To detect the opening of the git-rebase-todo file, I used the environment variables GIT_SEQUENCE_EDITOR and GIT_EDITOR to send a custom neovim command, which connects to the parent process and opens the file in a buffer, at the end of editing this file we send a signal to the child process to terminate it.

@TimUntersberger
Copy link
Collaborator

Thanks for explaining! 😄

@TimUntersberger TimUntersberger merged commit 06e986f into NeogitOrg:master Jul 21, 2022
@kessejones kessejones deleted the rebase-interactive branch July 21, 2022 20:32
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