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

Improve "discard specific unstaged changes" steps

Browse Source
This commit is contained in:
Peter Dave Hello 2017-04-09 16:20:44 +08:00 committed by GitHub
parent f3428ed7af
commit 542884da13
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -299,21 +299,11 @@ $ git reset filename
When you want to get rid of some, but not all changes in your working copy. 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 ```sh
$ git stash -p $ git checkout -p
# Select all of the snippets you want to save # Answer y to all of the snippets you want to drop
$ git reset --hard
$ git stash pop
```
Alternate strategy, stash undesired changes, drop stash.
```sh
$ git stash -p
# Select all of the snippets you don't want to save
git stash drop
``` ```
## Branches ## Branches