Skip to content

Commit b6ed44d

Browse files
committed
Incoporate suggested changes
1 parent 45c5dfe commit b6ed44d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ Or you could do it manually with a `git fetch` followed by a `git rebase teamone
208208

209209
If you are using `git pull` and want to make `--rebase` the default, you can set the `pull.rebase` config value with something like `git config --global pull.rebase true`.
210210

211-
If you treat rebasing as a way to clean up and work with commits before anyone could have based work on them, either because they have not been available publicly or it is a branch that you are the only one supposed to work on, then you'll be fine.
211+
If you only ever rebase commits that have never left your own computer, you'll be just fine.
212+
If you rebase commits that have been pushed, but that no one else has based commits from, you'll also be fine.
212213
If you rebase commits that have already been pushed publicly, and people may have based work on those commits, then you may be in for some frustrating trouble, and the scorn of your teammates.
213214

214215
If you or a partner does find it necessary at some point, make sure everyone knows to run `git pull --rebase` to try to make the pain after it happens a little bit simpler.

0 commit comments

Comments
 (0)