From 19c8ad3ab92102e4e7dc81d881012693204ffd67 Mon Sep 17 00:00:00 2001 From: Richard Littauer Date: Sat, 14 Mar 2015 11:06:23 -0700 Subject: [PATCH] Added then This makes it clear that `git rebase` is not a check to see if master is up to date. #3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e39495..7b413fe 100644 --- a/README.md +++ b/README.md @@ -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