You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/03-git-branching/sections/rebasing.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -235,4 +235,4 @@ Now, to the question of whether merging or rebasing is better: hopefully you'll
235
235
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.
236
236
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.
237
237
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