1 files changed, 18 insertions, 3 deletions
diff --git a/git-cat-file.html b/git-cat-file.html
index fadfda4fe..7a4c57cb6 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -754,7 +754,7 @@ git-cat-file(1) Manual Page
 <em>git cat-file</em> (-t | -s) [--allow-unknown-type] &lt;object&gt;
 <em>git cat-file</em> (--batch | --batch-check | --batch-command) [--batch-all-objects]
              [--buffer] [--follow-symlinks] [--unordered]
-             [--textconv | --filters] [-z]
+             [--textconv | --filters] [-Z]
 <em>git cat-file</em> (--textconv | --filters)
              [&lt;rev&gt;:&lt;path|tree-ish&gt; | --path=&lt;path|tree-ish&gt; &lt;rev&gt;]</pre>
 <div class="attribution">
@@ -1138,13 +1138,24 @@ respectively print:</p></div>
 </div></div>
 </dd>
 <dt class="hdlist1">
+-Z
+</dt>
+<dd>
+<p>
+        Only meaningful with <code>--batch</code>, <code>--batch-check</code>, or
+        <code>--batch-command</code>; input and output is NUL-delimited instead of
+        newline-delimited.
+</p>
+</dd>
+<dt class="hdlist1">
 -z
 </dt>
 <dd>
 <p>
         Only meaningful with <code>--batch</code>, <code>--batch-check</code>, or
         <code>--batch-command</code>; input is NUL-delimited instead of
-        newline-delimited.
+        newline-delimited. This option is deprecated in favor of
+        <code>-Z</code> as the output can otherwise be ambiguous.
 </p>
 </dd>
 </dl></div>
@@ -1303,6 +1314,10 @@ require more than 40 link resolutions to resolve).</p></div>
 </div></div>
 <div class="paragraph"><p>is printed when, during symlink resolution, a file is used as a
 directory name.</p></div>
+<div class="paragraph"><p>Alternatively, when <code>-Z</code> is passed, the line feeds in any of the above examples
+are replaced with NUL terminators. This ensures that output will be parsable if
+the output itself would contain a linefeed and is thus recommended for
+scripting purposes.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1330,7 +1345,7 @@ will be reported.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-01-27 09:44:35 PST
+ 2023-06-23 13:24:09 PDT
 </div>
 </div>
 </body>