alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Fixes #6: Force pushing after amending commits

Browse Source
This commit is contained in:
Kate Hudson 2014-07-29 13:14:46 -04:00
parent 14979dd611
commit 69204cdf0a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -21,8 +21,13 @@ For clarity's sake all examples in this document use customized bash prompt in o
``` ```
(my-branch*)$ git commit --amend (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 ## I need to combine commits
You need to do something called an interactive rebase. You need to do something called an interactive rebase.
@ -172,7 +177,7 @@ hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details. 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 (mybranch) $ git push origin mybranch -f