diff --git a/pages/common/git-stash.md b/pages/common/git-stash.md index 5ccbe1616..1c3a6b318 100644 --- a/pages/common/git-stash.md +++ b/pages/common/git-stash.md @@ -3,25 +3,25 @@ > Stash local Git changes in a temporary area. > More information: . -- Stash current changes, except new (untracked) files: +- Stash current changes with a [m]essage, except new (untracked) files: -`git stash push -m {{optional_stash_message}}` +`git stash push --message {{optional_stash_message}}` -- Stash current changes, including new (untracked) files: +- Stash current changes, including new ([u]ntracked) files: -`git stash -u` +`git stash --include-untracked` -- Interactively select parts of changed files for stashing: +- Interactively select [p]arts of changed files for stashing: -`git stash -p` +`git stash --patch` - List all stashes (shows stash name, related branch and message): `git stash list` -- Show the changes as a patch between the stash (default is `stash@{0}`) and the commit back when stash entry was first created: +- Show the changes as a [p]atch between the stash (default is `stash@{0}`) and the commit back when stash entry was first created: -`git stash show -p {{stash@{0}}}` +`git stash show --patch {{stash@{0}}}` - Apply a stash (default is the latest, named stash@{0}):