Skip to content

Commit 616bb8a

Browse files
authored
fixed minor grammar mistake
Guessing this should be from/to, as that's what a "trivial merge" would probably do: so all of the files you _haven't_ changed in will be updated. <=was so all of the files you _haven't_ changed will be updated. <=suggesting (as simpler for the other option below) rather than from/to (which : so all of the files you _haven't_ changed in will be updated. <==was so all of the files you _haven't_ changed in it will be updated. <== possible alternative
1 parent b04a01a commit 616bb8a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/07-git-tools/sections/reset.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ Like `reset`, `checkout` manipulates the three trees, and it is a bit different
268268
Running `git checkout [branch]` is pretty similar to running `git reset --hard [branch]` in that it updates all three trees for you to look like `[branch]`, but there are two important differences.
269269

270270
First, unlike `reset --hard`, `checkout` is working-directory safe; it will check to make sure it's not blowing away files that have changes to them.
271-
Actually, it's a bit smarter than that -- it tries to do a trivial merge in the Working Directory, so all of the files you _haven't_ changed in will be updated.
271+
Actually, it's a bit smarter than that -- it tries to do a trivial merge in the Working Directory, so all of the files you _haven't_ changed will be updated.
272272
`reset --hard`, on the other hand, will simply replace everything across the board without checking.
273273

274274
The second important difference is how `checkout` updates HEAD.

0 commit comments

Comments
 (0)