Skip to content

fix 'Splitting a Commit' rebase bug #1433

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2020
Merged

fix 'Splitting a Commit' rebase bug #1433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be569c6
fix 'Splitting a Commit' rebase bug
Sharpiro May 21, 2020
0f1a8e4
move new sentences to new source lines
Sharpiro May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions book/07-git-tools/sections/rewriting-history.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,12 @@ $ git log -4 --pretty=format:"%h %s"
1c002dd Add cat-file
9b29157 Add blame
35cfb2b Update README formatting
f3cc40e Change my name a bit
f7f3f6d Change my name a bit
----

Once again, this changes the SHA-1s of all the commits in your list, so make sure no commit shows up in that list that you've already pushed to a shared repository.
This changes the SHA-1s of the three most recent commits in your list, so make sure no changed commit shows up in that list that you've already pushed to a shared repository.
Notice that the last commit (`f7f3f6d`) in the list is unchanged.
Despite this commit being shown in the script, because it was marked as ``pick'' and was applied prior to any rebase changes, Git leaves the commit unmodified.

==== The Nuclear Option: filter-branch

Expand Down