summaryrefslogtreecommitdiffstats
path: root/git-stash.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-22 16:57:12 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-22 16:57:12 -0800
commita70c988a0584e1197ffd19b26c28e9790da32363 (patch)
treeeb0f2dd1584011f40e4589c81288ac3b9f3d7c61 /git-stash.txt
parentb4fc8e8cbb4fa1443a8546bdff0b1e5cd06f15fd (diff)
downloadgit-htmldocs-a70c988a0584e1197ffd19b26c28e9790da32363.tar.gz
Autogenerated HTML docs for v2.30.1-602-g966e6
Diffstat (limited to 'git-stash.txt')
-rw-r--r--git-stash.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-stash.txt b/git-stash.txt
index 31f1beb65..f1197d641 100644
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -8,8 +8,8 @@ git-stash - Stash the changes in a dirty working directory away
SYNOPSIS
--------
[verse]
-'git stash' list [<options>]
-'git stash' show [<options>] [<stash>]
+'git stash' list [<log-options>]
+'git stash' show [<diff-options>] [<stash>]
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
@@ -67,7 +67,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
Instead, all non-option arguments are concatenated to form the stash
message.
-list [<options>]::
+list [<log-options>]::
List the stash entries that you currently have. Each 'stash entry' is
listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is
@@ -83,7 +83,7 @@ stash@{1}: On master: 9cc0589... Add git-stash
The command takes options applicable to the 'git log'
command to control what is shown and how. See linkgit:git-log[1].
-show [<options>] [<stash>]::
+show [<diff-options>] [<stash>]::
Show the changes recorded in the stash entry as a diff between the
stashed contents and the commit back when the stash entry was first