diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:35 -0700 |
| commit | a5d4779e6ed1bebf56ab90bd264e437ac2232b98 (patch) | |
| tree | a2f8b05345648e4d8ba8e4109d743bfb2ad44ce4 /Documentation | |
| parent | cff1e3c870705cce828ab8b7d59ce4c2a785b9b1 (diff) | |
| parent | 9842c0c7492d2858d64ef81128f7b1f0b38e326b (diff) | |
| download | git-a5d4779e6ed1bebf56ab90bd264e437ac2232b98.tar.gz | |
Merge branch 'dk/stash-apply-index'
The stash.index configuration variable can be set to make "git stash
pop/apply" pretend that it was invoked with "--index".
* dk/stash-apply-index:
stash: honor stash.index in apply, pop modes
stash: refactor private config globals
t3905: remove unneeded blank line
t3903: reduce dependencies on previous tests
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/stash.adoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/stash.adoc b/Documentation/config/stash.adoc index ec1edaeba6..e556105a15 100644 --- a/Documentation/config/stash.adoc +++ b/Documentation/config/stash.adoc @@ -1,3 +1,8 @@ +stash.index:: + If this is set to true, `git stash apply` and `git stash pop` will + behave as if `--index` was supplied. Defaults to false. See the + descriptions in linkgit:git-stash[1]. + stash.showIncludeUntracked:: If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See |