diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-04 08:10:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-04 08:10:33 -0700 |
| commit | d63f334a8242f9e993b5bfb451f03394023ab877 (patch) | |
| tree | 7ddeaf84467ba1fce6ce2f3bc3d10825694bde53 /Documentation/git-stash.adoc | |
| parent | 540aaa607c5efcd94bb852a76a8ec3e07ea9a7bc (diff) | |
| parent | 2b3ae04011c3d679ba601c7ef9e20b9dec125ebb (diff) | |
| download | git-d63f334a8242f9e993b5bfb451f03394023ab877.tar.xz | |
Merge branch 'lm/add-p-context'
"git add/etc -p" now honor the diff.context configuration variable,
and also they learn to honor the -U<n> command-line option.
* lm/add-p-context:
add-patch: add diff.context command line overrides
add-patch: respect diff.context configuration
t: use test_config in t4055
t: use test_grep in t3701 and t4055
Diffstat (limited to 'Documentation/git-stash.adoc')
| -rw-r--r-- | Documentation/git-stash.adoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-stash.adoc b/Documentation/git-stash.adoc index e5e6c9d37f..e2300a19a2 100644 --- a/Documentation/git-stash.adoc +++ b/Documentation/git-stash.adoc @@ -222,6 +222,8 @@ to learn how to operate the `--patch` mode. The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this. +include::diff-context-options.adoc[] + -S:: --staged:: This option is only valid for `push` and `save` commands. |