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/diff-context-options.adoc | |
| parent | add-patch: respect diff.context configuration (diff) | |
| download | git-2b3ae04011c3d679ba601c7ef9e20b9dec125ebb.tar.gz git-2b3ae04011c3d679ba601c7ef9e20b9dec125ebb.zip | |
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/diff-context-options.adoc')
| -rw-r--r-- | Documentation/diff-context-options.adoc | 10 |
1 files changed, 10 insertions, 0 deletions
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<n>`:: +`--unified=<n>`:: + Generate diffs with _<n>_ lines of context. Defaults to `diff.context` + or 3 if the config option is unset. + +`--inter-hunk-context=<n>`:: + Show the context between diff hunks, up to the specified _<number>_ + of lines, thereby fusing hunks that are close to each other. + Defaults to `diff.interHunkContext` or 0 if the config option + is unset. |