diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-23 00:12:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-23 00:12:42 (GMT) |
| commit | b9554c03a0a8147109608b94feb32837a6e6a145 (patch) | |
| tree | 403059f744c33c6d096a2031d019738d0dea3e67 /Documentation | |
| parent | 2283e0e9af55689215afa39c03beb2315ce18e83 (diff) | |
| parent | 3e885f02775dad0d907d447bc3c24fa07870b41f (diff) | |
| download | git-b9554c03a0a8147109608b94feb32837a6e6a145.zip git-b9554c03a0a8147109608b94feb32837a6e6a145.tar.gz git-b9554c03a0a8147109608b94feb32837a6e6a145.tar.bz2 | |
Merge branch 'dl/stash-cleanup'
Documentation, code and test clean-up around "git stash".
* dl/stash-cleanup:
stash: declare ref_stash as an array
t3905: use test_cmp() to check file contents
t3905: replace test -s with test_file_not_empty
t3905: remove nested git in command substitution
t3905: move all commands into test cases
t3905: remove spaces after redirect operators
git-stash.txt: be explicit about subcommand options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stash.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 31f1beb..f1197d6 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/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 |