mirrors/git-flight-rules
mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged #7 with upstream

This commit is contained in:
Jack Maney 2014-07-29 17:54:47 -05:00
parent 3e6efe1c7e 69204cdf0a
commit 2a01c08c37
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -21,8 +21,14 @@ For clarity's sake all examples in this document use customized bash prompt in o
```
(my-branch*)$ git commit --amend
```
<a name="force-push"></a>
### 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 &ndash; *always* make sure you specify a branch!
<a name="interactive-rebase"></a>
## I need to combine commits
@ -176,7 +182,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 &ndash; *always* make sure you specify a branch!
```
(mybranch) $ git push origin mybranch -f