From 2b3ae04011c3d679ba601c7ef9e20b9dec125ebb Mon Sep 17 00:00:00 2001 From: Leon Michalak Date: Tue, 29 Jul 2025 07:01:51 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/diff-context-options.adoc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Documentation/diff-context-options.adoc (limited to 'Documentation/diff-context-options.adoc') diff --git a/Documentation/diff-context-options.adoc b/Documentation/diff-context-options.adoc new file mode 100644 index 0000000000..e161260358 --- /dev/null +++ b/Documentation/diff-context-options.adoc @@ -0,0 +1,10 @@ +`-U`:: +`--unified=`:: + Generate diffs with __ lines of context. Defaults to `diff.context` + or 3 if the config option is unset. + +`--inter-hunk-context=`:: + Show the context between diff hunks, up to the specified __ + of lines, thereby fusing hunks that are close to each other. + Defaults to `diff.interHunkContext` or 0 if the config option + is unset. -- cgit v1.2.3