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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vindarel/legit rebase interactive #855

Merged
merged 6 commits into from Jul 20, 2023

Conversation

vindarel
Copy link
Collaborator

@vindarel vindarel commented Jul 20, 2023

Works for the base case, we can pickup/fixup commits, other verbs that need another editing action (edit, reword) don't work.

I wrote up todos and other obvious missing features.

To start a rebase: put the point on a commit, press r i.

Awesome though of course 馃槑

(message (str:join #\newline (remove-if #'null (list message output)))))
(let ((msg (str:join #\newline (remove-if #'null (list message output)))))
(when (str:non-blank-string-p msg)
(message msg))))
Copy link
Member

Choose a reason for hiding this comment

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

It probably malfunctions if a ~ is included.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

mmh right, but the messages come from porcelain, so it should be fine?

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I think it's better to write in a safe way to avoid unnecessary worry.

Copy link
Member

Choose a reason for hiding this comment

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

That said, it's not enough of a problem to hinder development.
I am very grateful to you for doing such a great job.

@cxxxr
Copy link
Member

cxxxr commented Jul 20, 2023

Thank you for the very nice PR!

@cxxxr cxxxr merged commit fa465e3 into lem-project:main Jul 20, 2023
1 check passed
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

2 participants