]> git.ipfire.org Git - thirdparty/git.git/commit
add-patch: add diff.context command line overrides
authorLeon Michalak <leonmichalak6@gmail.com>
Tue, 29 Jul 2025 07:01:51 +0000 (07:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jul 2025 15:52:45 +0000 (08:52 -0700)
commit2b3ae04011c3d679ba601c7ef9e20b9dec125ebb
tree42b7e6f556cf2e469fd80119cdb562cd60128b58
parent2b0a2db2c0bf4870592656e8f50876957db8660c
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>
19 files changed:
Documentation/diff-context-options.adoc [new file with mode: 0644]
Documentation/git-add.adoc
Documentation/git-checkout.adoc
Documentation/git-commit.adoc
Documentation/git-reset.adoc
Documentation/git-restore.adoc
Documentation/git-stash.adoc
add-interactive.c
add-interactive.h
add-patch.c
builtin/add.c
builtin/checkout.c
builtin/commit.c
builtin/reset.c
builtin/stash.c
commit.h
parse-options.h
t/t3701-add-interactive.sh
t/t9902-completion.sh