revert(3p/git): Revert merge of git upstream at v2.26.2 r/852

This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.

1 files changed, 8 insertions, 17 deletions

diff --git a/third_party/git/Documentation/git-fast-export.txt b/third_party/git/Documentation/git-fast-export.txt
index e8950de3ba..cc940eb9ad 100644
--- a/third_party/git/Documentation/git-fast-export.txt
+++ b/third_party/git/Documentation/git-fast-export.txt
@@ -17,9 +17,9 @@ This program dumps the given revisions in a form suitable to be piped
 into 'git fast-import'.
 
 You can use it as a human-readable bundle replacement (see
-linkgit:git-bundle[1]), or as a format that can be edited before being
-fed to 'git fast-import' in order to do history rewrites (an ability
-relied on by tools like 'git filter-repo').
+linkgit:git-bundle[1]), or as a kind of an interactive
+'git filter-branch'.
+
 
 OPTIONS
 -------
@@ -75,20 +75,11 @@ produced incorrect results if you gave these options.
 	Before processing any input, load the marks specified in
 	<file>.  The input file must exist, must be readable, and
 	must use the same format as produced by --export-marks.
-
---mark-tags::
-	In addition to labelling blobs and commits with mark ids, also
-	label tags.  This is useful in conjunction with
-	`--export-marks` and `--import-marks`, and is also useful (and
-	necessary) for exporting of nested tags.  It does not hurt
-	other cases and would be the default, but many fast-import
-	frontends are not prepared to accept tags with mark
-	identifiers.
 +
-Any commits (or tags) that have already been marked will not be
-exported again.  If the backend uses a similar --import-marks file,
-this allows for incremental bidirectional exporting of the repository
-by keeping the marks the same across runs.
+Any commits that have already been marked will not be exported again.
+If the backend uses a similar --import-marks file, this allows for
+incremental bidirectional exporting of the repository by keeping the
+marks the same across runs.
 
 --fake-missing-tagger::
 	Some old repositories have tags without a tagger.  The
@@ -142,7 +133,7 @@ by keeping the marks the same across runs.
 	Specify how to handle `encoding` header in commit objects.  When
 	asking to 'abort' (which is the default), this program will die
 	when encountering such a commit object.  With 'yes', the commit
-	message will be re-encoded into UTF-8.  With 'no', the original
+	message will be reencoded into UTF-8.  With 'no', the original
 	encoding will be preserved.
 
 --refspec::