"Recent commits" section does not show if there are unmerged commits

[fnune]

"Recent commits" section does not show if there are unmerged commits

[CKolkey]

Not a bug; this is how Magit renders the status buffer with unmerged commits. You could add a "show_recent_despite_unmerged_commits" config option if you're so inclined :)

[fnune]

I see, sorry to have characterized it as such. I did so because the previous behavior was to keep showing "Recent commits".

If this is the design, then 👍

THX!

[CKolkey]

No worries :)

[wrobell]

Please consider the following.

I have list of recent commits and I would like to rebase

1. Go to the commit
2. Hit r to rebase
3. Rebase

Now, I commit a change and I would like to rebase to previous commit

1. Move away from the commit (or the below is not possible)
2. Hit r for rebase
3. There is a list of commits, but I am at the bottom of the screen, therefore move to the top of the screen
4. Select the commit
5. Rebase

Is there a way to simplify the 2nd scenario without list of recent commits?

[CKolkey]

I'm not sure if this answers your question, but you can invoke the rebase popup from both the reflog and log buffers to use the commit under your cursor as the "selection" for rebasing.

[wrobell]

@CKolkey It seems then, after a commit, the flow could be

1. Enter log buffer
2. I am at the bottom of the screen, move to the top of the screen
3. Select commit
4. Rebase

IMHO, if there was simply list of recent commits, there would be less friction.

Alternatively, when my cursor is on "Head", "Merge" or other top-lines in the neogit buffer, then hitting r could directly go to rebase screen selecting that commit. At the moment, hitting r opens log buffer (with cursor located at the bottom).

[wrobell]

BTW. For last couple of weeks rebasing from log buffer is broken (ll) - first line is empty instead of showing selected commit. Works as expected when using recent commits.