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 <stepnem@gmail.com> Mentored-and-Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Štěpán Němec committed
Oct 8, 2010 at 20:40 UTC
01398df31cd5a667faa005e85eb3c9aac66aaf44
1 file changed
+2
-2
Documentation/diff-options.txt
+2
-2
@@ -248,13 +248,13 @@ endif::git-log[]
248
If `n` is specified, it has the same meaning as for `-M<n>`.
249
250
ifndef::git-format-patch[]
251
---diff-filter=[ACDMRTUXB*]::
251
+--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
252
Select only files that are Added (`A`), Copied (`C`),
253
Deleted (`D`), Modified (`M`), Renamed (`R`), have their
254
type (i.e. regular file, symlink, submodule, ...) changed (`T`),
255
are Unmerged (`U`), are
256
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.
258
When `*` (All-or-none) is added to the combination, all
259
paths are selected if there is any file that matches
260
other criteria in the comparison; if there is no file