Minor tweaks (grammar, fonts) to "Reset Demystified" #906
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ben
reviewed
Oct 30, 2017
book/07-git-tools/sections/reset.asc
Outdated
| Say you have a series of commits with messages like ``oops.'', ``WIP'' and ``forgot this file''. | ||
| You can use `reset` to quickly and easily squash them into a single commit that makes you look really smart. | ||
| (<<_squashing>> shows another way to do this, but in this example it's simpler to use `reset`.) | ||
| (<<_squashing>> shows another way to do this but, in this example it's simpler to use `reset`.) |
Member
There was a problem hiding this comment.
I disagree with this change. If it were "clause, but, clause, clause" I agree that the comma should come before "but", but in a "clause, but clause" structure the comma should stay before.
Oh, I just found a source to back up my instinct:
Rule: Use a comma before a coordinating conjunction that joins two independent clauses.
She purchased the car, but she declined the extended warranty.
Author
There was a problem hiding this comment.
OK, fixed, commit amended and pushed.
b5cc2cf to
577a249
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.