global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-11 09:29:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ty/doc-diff-u-wo-number' into jch

Browse Source 
* ty/doc-diff-u-wo-number:
  diff: document -U without <n> as using default context
This commit is contained in:
Junio C Hamano
2026-03-10 14:24:03 -07:00
parent f7948e8fb5 4f6a803aba
commit 9d9a64660e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/diff-context-options.adoc
View File

@@ -1,7 +1,9 @@
`-U<n>`::
`--unified=<n>`::
Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
or 3 if the config option is unset.
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>_

6
Documentation/diff-options.adoc
View File

@@ -127,8 +127,10 @@ endif::git-log[]
`-U<n>`::
`--unified=<n>`::
Generate diffs with _<n>_ lines of context instead of
the usual three.
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).
ifndef::git-format-patch[]
Implies `--patch`.
endif::git-format-patch[]