mirror of
https://github.com/git/git.git
synced 2026-01-11 13:23:12 +09:00
9842c0c749
With stash.index=true, git-stash(1) command now tries to reinstate the index by default in the "apply" and "pop" modes. Not doing so creates a common trap [1], [2]: "git stash apply" is not the reverse of "git stash push" because carefully staged indices are lost and have to be manually recreated. OTOH, this mode is not always desirable and may create more conflicts when applying stashes. As usual, "--no-index" will disable this behavior if you set "stash.index". [1]: https://lore.kernel.org/git/CAPx1GvcxyDDQmCssMjEnt6JoV6qPc5ZUpgPLX3mpUC_4PNYA1w@mail.gmail.com/ [2]: https://lore.kernel.org/git/c5a811ac-8cd3-c389-ac6d-29020a648c87@gmail.com/ Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 lines
847 B
Plaintext
20 lines
847 B
Plaintext
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
|
|
the description of the 'show' command in linkgit:git-stash[1].
|
|
|
|
stash.showPatch::
|
|
If this is set to true, the `git stash show` command without an
|
|
option will show the stash entry in patch form. Defaults to false.
|
|
See the description of the 'show' command in linkgit:git-stash[1].
|
|
|
|
stash.showStat::
|
|
If this is set to true, the `git stash show` command without an
|
|
option will show a diffstat of the stash entry. Defaults to true.
|
|
See the description of the 'show' command in linkgit:git-stash[1].
|