Skip to content

Commit 78b8404

Browse files
committed
Update rebasing.asc
Tiny typo Git calculate a checksum -> Git calculates a checksum
1 parent 9c12d93 commit 78b8404

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/03-git-branching/sections/rebasing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ It's pretty safe to assume that the other developer doesn't want `C4` and `C6` t
181181

182182
If you *do* find yourself in a situation like this, Git has some further magic that might help you out. If someone on your team force pushes changes that overwrite work that you've based work on, your challenge is to figure out what is yours and what they've rewritten.
183183

184-
It turns out that in addition to the commit SHA checksum, Git also calculate a checksum that is based just on the patch introduced with the commit. This is called a ``patch-id''.
184+
It turns out that in addition to the commit SHA checksum, Git also calculates a checksum that is based just on the patch introduced with the commit. This is called a ``patch-id''.
185185

186186
If you pull down work that was rewritten and rebase it on top of the new commits from your partner, Git can often successfully figure out what is uniquely yours and apply them back on top of the new branch.
187187

0 commit comments

Comments
 (0)