Skip to content

interactive rebase editor: rebasing over !amend commits doesn't show the !amend commit in the editor #2684

@EFord36

Description

@EFord36

Description

When running an interactive rebase, if there's a commit created like:

git commit --fixup=amend:742ab0da9f3cc93173ba0af07367352fd340d237

That commit doesn't seem to display in the interactive rebase editor.

GitLens Version

13.6.0

VS Code Version

Version: 1.78.2 (Universal)
Commit: b3e4e68a0bc097f0ae7907b217c1119af9e03435
Date: 2023-05-10T14:44:45.204Z (1 wk ago)
Electron: 22.5.2
Chromium: 108.0.5359.215
Node.js: 16.17.1
V8: 10.8.168.25-electron.0
OS: Darwin arm64 22.4.0
Sandboxed: No

Git Version

git version 2.40.1

Logs, Screenshots, Screen Captures, etc

before a rebase (with my email on the commits obscured)
Screenshot 2023-05-18 at 11 49 43 , output of git log -p, showing the full history of a test repo.

The after git rebase -i --autostash --autosquash 29365add362f9c113cc29d7abb547a375052f41b

the interactive rebase editor looks like this:

Screenshot 2023-05-18 at 11 41 32

The output of git log -p is as expected:

Screenshot 2023-05-18 at 11 52 24

Metadata

Metadata

Assignees

No one assigned

    Labels

    area-rebase-editorIssues or features related to the Interactive Rebase Editor

    Type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions