From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jul 2021 20:05:53 +0000 (-0700)
Subject: Merge branch 'jk/typofix'
X-Git-Tag: v2.33.0-rc0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f0c15bfb6f23c5afea36d6698dea157d53c0c72;p=thirdparty%2Fgit.git

Merge branch 'jk/typofix'

Typofix.

* jk/typofix:
  doc/rev-list-options: fix duplicate word typo
---

8f0c15bfb6f23c5afea36d6698dea157d53c0c72
diff --cc Documentation/rev-list-options.txt
index 5bf2a85f69,c8b2bd2d81..5200f18d2c
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -892,43 -719,13 +892,43 @@@ or units.  n may be zero.  The suffixe
  units in KiB, MiB, or GiB.  For example, 'blob:limit=1k' is the same
  as 'blob:limit=1024'.
  +
 +The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects
 +which are not of the requested type.
 ++
  The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
  specification contained in the blob (or blob-expression) '<blob-ish>'
- to omit blobs that would not be not required for a sparse checkout on
+ to omit blobs that would not be required for a sparse checkout on
  the requested refs.
  +
 -The form '--filter=sparse:path=<path>' similarly uses a sparse-checkout
 -specification contained in <path>.
 +The form '--filter=tree:<depth>' omits all blobs and trees whose depth
 +from the root tree is >= <depth> (minimum depth if an object is located
 +at multiple depths in the commits traversed). <depth>=0 will not include
 +any trees or blobs unless included explicitly in the command-line (or
 +standard input when --stdin is used). <depth>=1 will include only the
 +tree and blobs which are referenced directly by a commit reachable from
 +<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
 +while also including trees and blobs one more level removed from an
 +explicitly-given commit or tree.
 ++
 +Note that the form '--filter=sparse:path=<path>' that wants to read
 +from an arbitrary path on the filesystem has been dropped for security
 +reasons.
 ++
 +Multiple '--filter=' flags can be specified to combine filters. Only
 +objects which are accepted by every filter are included.
 ++
 +The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
 +used to combined several filters, but this is harder than just repeating
 +the '--filter' flag and is usually not necessary. Filters are joined by
 +'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
 +Besides the '{plus}' and '%' characters, the following characters are
 +reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+&#39;&#96;+
 +as well as all characters with ASCII code &lt;= `0x20`, which includes
 +space and newline.
 ++
 +Other arbitrary characters can also be encoded. For instance,
 +'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
 +equivalent.
  
  --no-filter::
  	Turn off any previous `--filter=` argument.