Skip to content

Commit d4871c9

Browse files
authored
Merge pull request #1470 from HonkingGoose/bugfix/rewrite-overly-long-sentence
Rewrite overly long sentence
2 parents 5a514e1 + 8d8a0b3 commit d4871c9

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
@@ -235,4 +235,4 @@ Now, to the question of whether merging or rebasing is better: hopefully you'll
235235
Git is a powerful tool, and allows you to do many things to and with your history, but every team and every project is different.
236236
Now that you know how both of these things work, it's up to you to decide which one is best for your particular situation.
237237

238-
In general the way to get the best of both worlds is to rebase local changes you've made but haven't shared yet before you push them in order to clean up your story, but never rebase anything you've pushed somewhere.
238+
You can get the best of both worlds: rebase local changes before pushing to clean up your work, but never rebase anything that you've pushed somewhere.

0 commit comments

Comments
 (0)