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

Recommend --force-with-lease instead of --force (#117)

Browse Source
This commit is contained in:
Bence Dányi 2017-11-07 15:19:44 +01:00 committed by Richard Littauer
parent 4a654bd90a
commit 9f0a1d2ae3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -145,7 +145,7 @@ If you need to delete pushed commits, you can use the following. However, it wil
```sh ```sh
$ git reset HEAD^ --hard $ git reset HEAD^ --hard
$ git push -f [remote] [branch] $ git push --force-with-lease [remote] [branch]
``` ```
If you haven't pushed, to reset Git to the state it was in before you made your last commit (while keeping your staged changes): If you haven't pushed, to reset Git to the state it was in before you made your last commit (while keeping your staged changes):
@ -155,7 +155,7 @@ If you haven't pushed, to reset Git to the state it was in before you made your
``` ```
This only works if you haven't pushed. If you have pushed, the only truly safe thing to do is `git revert SHAofBadCommit`. That will create a new commit that undoes all the previous commit's changes. Or, if the branched you pushed to is rebase-safe (ie. other devs aren't expected to pull from it), you can just use `git push -f`. For more, see [the above section](#deleteremove-last-pushed-commit). This only works if you haven't pushed. If you have pushed, the only truly safe thing to do is `git revert SHAofBadCommit`. That will create a new commit that undoes all the previous commit's changes. Or, if the branched you pushed to is rebase-safe (ie. other devs aren't expected to pull from it), you can just use `git push --force-with-lease`. For more, see [the above section](#deleteremove-last-pushed-commit).
<a name="delete-any-commit"></a> <a name="delete-any-commit"></a>
### Delete/remove arbitrary commit ### Delete/remove arbitrary commit
@ -164,7 +164,7 @@ The same warning applies as above. Never do this if possible.
```sh ```sh
$ git rebase --onto SHA1_OF_BAD_COMMIT^ SHA1_OF_BAD_COMMIT $ git rebase --onto SHA1_OF_BAD_COMMIT^ SHA1_OF_BAD_COMMIT
$ git push -f [remote] [branch] $ git push --force-with-lease [remote] [branch]
``` ```
Or do an [interactive rebase](#interactive-rebase) and remove the line(s) corresponding to commit(s) you want to see removed. Or do an [interactive rebase](#interactive-rebase) and remove the line(s) corresponding to commit(s) you want to see removed.
@ -182,14 +182,15 @@ 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.
``` ```
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! Note that, as with rebasing (see below), amending **replaces the old commit with a new one**, so you must force push (`--force-with-lease`) 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!
```sh ```sh
(my-branch)$ git push origin mybranch -f (my-branch)$ git push origin mybranch --force-with-lease
``` ```
In general, **avoid force pushing**. It is best to create and push a new commit rather than force-pushing the amended commit as it has will cause conflicts in the source history for any other developer who has interacted with the branch in question or any child branches. In general, **avoid force pushing**. It is best to create and push a new commit rather than force-pushing the amended commit as it has will cause conflicts in the source history for any other developer who has interacted with the branch in question or any child branches. `--force-with-lease` will still fail, if someone else was also working on the same branch as you, and your push would overwrite those changes.
If you are *absolutely* sure that nobody is working on the same branch or you want to update the tip of the branch *unconditionally*, you can use `--force` (`-f`), but this should be avoided in general.
<a href="undo-git-reset-hard"></a> <a href="undo-git-reset-hard"></a>
### I accidentally did a hard reset, and I want my changes back ### I accidentally did a hard reset, and I want my changes back