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

Merge branch 'pr/106'

This commit is contained in:
Richard Littauer 2017-06-05 12:08:59 +01:00
parent 998dd0c7fb 51d78e43c5
commit 2a86ef478e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -299,7 +299,14 @@ $ git reset filename
When you want to get rid of some, but not all changes in your working copy.
First strategy, stash all good changes, reset working copy, reapply good changes.
Checkout undesired changes, keep good changes.
```sh
$ git checkout -p
# Answer y to all of the snippets you want to drop
```
Another strategy involves using `stash`. Stash all the good changes, reset working copy, and reapply good changes.
```sh
$ git stash -p
@ -308,12 +315,12 @@ $ git reset --hard
$ git stash pop
```
Alternate strategy, stash undesired changes, drop stash.
Alternatively, stash your undesired changes, and then drop stash.
```sh
$ git stash -p
# Select all of the snippets you don't want to save
git stash drop
$ git stash drop
```
## Branches