Skip to content

Commit

Permalink
doc: more config options not affecting the git-diff-* plumbing commands
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Koutcher <[email protected]>
  • Loading branch information
koutcher committed May 24, 2024
1 parent 2c7b491 commit b6db17d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
8 changes: 6 additions & 2 deletions Documentation/config/diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ and accumulating child directory counts in the parent directories:

diff.statNameWidth::
Limit the width of the filename part in --stat output. If set, applies
to all commands generating --stat output except format-patch.
to all commands generating --stat output except format-patch and the
'git-diff-{asterisk}' plumbing commands.

diff.statGraphWidth::
Limit the width of the graph part in --stat output. If set, applies
to all commands generating --stat output except format-patch.
to all commands generating --stat output except format-patch and the
'git-diff-{asterisk}' plumbing commands.

diff.context::
Generate diffs with <n> lines of context instead of the default
Expand Down Expand Up @@ -126,6 +128,8 @@ diff.orderFile::
See the '-O' option to linkgit:git-diff[1] for details.
If `diff.orderFile` is a relative pathname, it is treated as
relative to the top of the working tree.
Setting `diff.orderFile` does not affect the 'git-diff-{asterisk}'
plumbing commands.

diff.renameLimit::
The number of files to consider in the exhaustive portion of
Expand Down
5 changes: 4 additions & 1 deletion Documentation/diff-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ have to use `--diff-algorithm=default` option.
`diff.statGraphWidth=<width>`. Using `--stat` or
`--stat-graph-width` affects all commands generating a stat graph,
while setting `diff.statNameWidth` or `diff.statGraphWidth`
does not affect `git format-patch`.
does not affect `git format-patch` and the 'git-diff-{asterisk}'
plumbing commands.
By giving a third parameter `<count>`, you can limit the output to
the first `<count>` lines, followed by `...` if there are more.
+
Expand Down Expand Up @@ -710,6 +711,8 @@ endif::git-format-patch[]
This overrides the `diff.orderFile` configuration variable
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`.
Setting `diff.orderFile` does not affect the 'git-diff-{asterisk}'
plumbing commands.
+
The output order is determined by the order of glob patterns in
<orderfile>.
Expand Down

0 comments on commit b6db17d

Please sign in to comment.