mirror of
https://github.com/git/git.git
synced 2026-03-11 09:29:49 +01:00
4f6a803aba
The documentation for '-U<n>' implies that the numeric value '<n>' is mandatory. However, the command line parser has historically accepted '-U' without a number. Strictly requiring a number for '-U' would break existing tests (e.g., in 't4013') and likely disrupt user scripts relying on this undocumented behavior. Hence we retain this fallback behavior for backward compatibility, but document it as such. Signed-off-by: Tian Yuchen <cat@malon.dev> Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 lines
505 B
Plaintext
13 lines
505 B
Plaintext
`-U<n>`::
|
|
`--unified=<n>`::
|
|
Generate diffs with _<n>_ lines of context. The number of context
|
|
lines defaults to `diff.context` or 3 if the configuration variable
|
|
is unset. (`-U` without `<n>` is silently accepted as a synonym for
|
|
`-p` due to a historical accident).
|
|
|
|
`--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.
|