Skip to content

Commit 0860f81

Browse files
authored
Merge pull request #1433 from Sharpiro/rewriting-history-rebase-bug
2 parents 8512004 + 0f1a8e4 commit 0860f81

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

book/07-git-tools/sections/rewriting-history.asc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,12 @@ $ git log -4 --pretty=format:"%h %s"
292292
1c002dd Add cat-file
293293
9b29157 Add blame
294294
35cfb2b Update README formatting
295-
f3cc40e Change my name a bit
295+
f7f3f6d Change my name a bit
296296
----
297297

298-
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.
298+
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.
299+
Notice that the last commit (`f7f3f6d`) in the list is unchanged.
300+
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.
299301

300302
==== The Nuclear Option: filter-branch
301303

0 commit comments

Comments
 (0)