Skip to content

Commit 01398df

Browse files
Štěpán Němecgitster
authored andcommitted
Fix odd markup in --diff-filter documentation
Instead of using the regex-like bracket expression, use grouping to make it more consistent with other similar places. The brackets now have the same meaning as in other documentation (i.e., the argument is optional). Signed-off-by: Štěpán Němec <[email protected]> Mentored-and-Acked-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 62b4698 commit 01398df

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/diff-options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ endif::git-log[]
248248
If `n` is specified, it has the same meaning as for `-M<n>`.
249249

250250
ifndef::git-format-patch[]
251-
--diff-filter=[ACDMRTUXB*]::
251+
--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
252252
Select only files that are Added (`A`), Copied (`C`),
253253
Deleted (`D`), Modified (`M`), Renamed (`R`), have their
254254
type (i.e. regular file, symlink, submodule, ...) changed (`T`),
255255
are Unmerged (`U`), are
256256
Unknown (`X`), or have had their pairing Broken (`B`).
257-
Any combination of the filter characters may be used.
257+
Any combination of the filter characters (including none) can be used.
258258
When `*` (All-or-none) is added to the combination, all
259259
paths are selected if there is any file that matches
260260
other criteria in the comparison; if there is no file

0 commit comments

Comments
 (0)