Skip to content

Commit

Permalink
Fixes k88hudson#6: Force pushing after amending commits
Browse files Browse the repository at this point in the history
  • Loading branch information
k88hudson committed Jul 29, 2014
1 parent 14979dd commit 69204cd
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@ For clarity's sake all examples in this document use customized bash prompt in o

```
(my-branch*)$ git commit --amend
```

### I tried to push my amended commit to a remote, but I got an error message

Note that, as with rebasing (see below), amending **replaces the old commit with a new one**, so you must force push (`-f`) your changes if you have already pushed the pre-amended commit to your remote. Be careful when you do this – *always* make sure you specify a branch!

## I need to combine commits

You need to do something called an interactive rebase.
Expand Down Expand Up @@ -172,7 +177,7 @@ hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
```

Since rebasing **replaces the old commit(s) with a new one**, you must force push (`-f`) your changes. Be careful when you do this - *always* make sure you specify a branch!
Since rebasing **replaces the old commit(s) with a new one**, you must force push (`-f`) your changes. Be careful when you do this – *always* make sure you specify a branch!

```
(mybranch) $ git push origin mybranch -f
Expand Down

0 comments on commit 69204cd

Please sign in to comment.