1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00

Added then

This makes it clear that `git rebase` is not a check to see if master is up to date. #3
This commit is contained in:
Richard Littauer 2015-03-14 11:06:23 -07:00
parent a2d407f12e
commit 19c8ad3ab9

View File

@ -42,7 +42,7 @@ In general, **avoid force pushing**. It is best to create and push a new commit
You need to do something called an interactive rebase.
If you are working in a branch that is/will become a pull-request against `master`, you can rebase against your `master` branch. Make sure it is up to date:
If you are working in a branch that is/will become a pull-request against `master`, you can rebase against your `master` branch. Make sure the master branch is up to date, then:
```
(my-branch)$ git rebase -i master