diff options
| author | Leon Michalak <leonmichalak6@gmail.com> | 2025-07-29 07:01:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-29 08:52:45 -0700 |
| commit | 2b3ae04011c3d679ba601c7ef9e20b9dec125ebb (patch) | |
| tree | 42b7e6f556cf2e469fd80119cdb562cd60128b58 /Documentation/git-stash.adoc | |
| parent | 2b0a2db2c0bf4870592656e8f50876957db8660c (diff) | |
| download | git-2b3ae04011c3d679ba601c7ef9e20b9dec125ebb.tar.xz | |
add-patch: add diff.context command line overrides
This patch compliments the previous commit, where builtins that use
add-patch infrastructure now respect diff.context and
diff.interHunkContext file configurations.
In particular, this patch helps users who don't want to set persistent
context configurations or just want a way to override them on a one-time
basis, by allowing the relevant builtins to accept corresponding command
line options that override the file configurations.
This mimics commands such as diff and log, which allow for both context
file configuration and command line overrides.
Signed-off-by: Leon Michalak <leonmichalak6@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 1a5177f498..0578c619c4 100644 --- a/Documentation/git-stash.adoc +++ b/Documentation/git-stash.adoc @@ -208,6 +208,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. |