diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 02:14:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 02:14:43 (GMT) |
| commit | e36adf712251a19bd2ada0016764d340dfcf2ba0 (patch) | |
| tree | 0b58e0a8e315bb737fdcdb16cf8f30d262025f76 /Documentation | |
| parent | ffac537e6cbbf934b08745a378932722df287a53 (diff) | |
| parent | 7906af0cb84c8e65656347909abd4e22b04d1c1e (diff) | |
| download | git-e36adf712251a19bd2ada0016764d340dfcf2ba0.zip git-e36adf712251a19bd2ada0016764d340dfcf2ba0.tar.gz git-e36adf712251a19bd2ada0016764d340dfcf2ba0.tar.bz2 | |
Merge branch 'ps/stash-in-c'
"git stash" rewritten in C.
* ps/stash-in-c: (28 commits)
tests: add a special setup where stash.useBuiltin is off
stash: optionally use the scripted version again
stash: add back the original, scripted `git stash`
stash: convert `stash--helper.c` into `stash.c`
stash: replace all `write-tree` child processes with API calls
stash: optimize `get_untracked_files()` and `check_changes()`
stash: convert save to builtin
stash: make push -q quiet
stash: convert push to builtin
stash: convert create to builtin
stash: convert store to builtin
stash: convert show to builtin
stash: convert list to builtin
stash: convert pop to builtin
stash: convert branch to builtin
stash: convert drop and clear to builtin
stash: convert apply to builtin
stash: mention options in `show` synopsis
stash: add tests for `git stash show` config
stash: rename test cases to be more descriptive
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stash.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 7ef8c47..e31ea7d 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git stash' list [<options>] -'git stash' show [<stash>] +'git stash' show [<options>] [<stash>] 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] @@ -106,7 +106,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 [<stash>]:: +show [<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 |