Skip to content

Add change id and enable keybinding conf#2

Merged
peso merged 2 commits into
peso:rebasefrom
Edgpaez:rebase
Dec 4, 2025
Merged

Add change id and enable keybinding conf#2
peso merged 2 commits into
peso:rebasefrom
Edgpaez:rebase

Conversation

@Edgpaez

@Edgpaez Edgpaez commented Nov 23, 2025

Copy link
Copy Markdown

Hi @peso
Thank you for implementing rebase!

I have been using it locally and I really liked this approach to show the CLI options and being able to select them by tying it directly (so typing 'A' selects the '-A' option).

Anyway, this simple PR adds two things:

  1. Showing the change id too, so change id and commit id are visible from the pop up
  2. Adding the field to LogTabKeybindsConfig so keybindings for this can be configured

Happy to make further changes if you feel is necessary 👍

@peso

peso commented Nov 24, 2025

Copy link
Copy Markdown
Owner

You are welcome, and thank you for the PR. It is always nice to get contributions.

Comment thread src/ui/log_tab.rs Outdated
Comment thread src/ui/rebase_popup.rs Outdated
Comment thread src/ui/rebase_popup.rs Outdated
Comment thread src/ui/rebase_popup.rs Outdated
Comment thread src/ui/rebase_popup.rs Outdated
@peso
peso force-pushed the rebase branch 2 times, most recently from 6a1f35d to adb5f6c Compare November 24, 2025 15:45
@Edgpaez

Edgpaez commented Dec 3, 2025

Copy link
Copy Markdown
Author

Hi @peso
Thank you for the feedback. I just pushed new commits. It now looks like this:
image

and receives two Head as new(source_rev: Head, target_rev: Head) 👍

@peso
peso merged commit ea8c69d into peso:rebase Dec 4, 2025
@peso

peso commented Dec 4, 2025

Copy link
Copy Markdown
Owner

Now, the only problem left is that this repository is my personal clone of the official lazyjj repository. As far as I understand github and the squash-PR-method, that means that your commit will be squashed along with any other commits that I push to lazyjj and it will all be under my name.

Maybe you want to make a separate identical PR to lazyjj, after my rebase PR has been accepted, so you will get credit for your work? If that is the case, I can remove it from PR 151 (so you can add it later).

Which approach do you prefer, @Edgpaez ?

@Edgpaez

Edgpaez commented Dec 4, 2025

Copy link
Copy Markdown
Author

Hi, I don't really mind about the credit. I am ok with 151 including everything as it does now 👍
Thanks again for implementing rebase!

@Edgpaez
Edgpaez deleted the rebase branch January 10, 2026 02:48
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.

3 participants