Skip to content

07-git-tools-rewriting-history-Splitting a Commit rebase bug #1431

@Sharpiro

Description

@Sharpiro

Which version of the book is affected?

the online book
Describe the bug:

In the Splitting a Commit section:

I believe the line f3cc40e Change my name a bit should instead be f7f3f6d Change my name a bit Because f7f3f6d was pick during the interactive rebase, and it is older than 310154e which was marked as edit, that commit should not change.

Context:
This:

$ git log -4 --pretty=format:"%h %s"
1c002dd Add cat-file
9b29157 Add blame
35cfb2b Update README formatting
f3cc40e Change my name a bit

Should be:

$ git log -4 --pretty=format:"%h %s"
1c002dd Add cat-file
9b29157 Add blame
35cfb2b Update README formatting
f7f3f6d Change my name a bit

And then the explanation below would need to explain that all child commits of f7f3f6d were modified in the rebase, rather than "all" the ones seen in the rebase menu.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions