Skip to content

Commit

Permalink
Added then
Browse files Browse the repository at this point in the history
This makes it clear that `git rebase` is not a check to see if master is up to date. k88hudson#3
  • Loading branch information
RichardLitt committed Mar 14, 2015
1 parent a2d407f commit 19c8ad3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 19c8ad3

Please sign in to comment.