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, 1 insertions, 39 deletions

diff --git a/third_party/git/Documentation/git-fast-import.txt b/third_party/git/Documentation/git-fast-import.txt
index 7889f9594054..fad327aecc1b 100644
--- a/third_party/git/Documentation/git-fast-import.txt
+++ b/third_party/git/Documentation/git-fast-import.txt
@@ -51,21 +51,6 @@ OPTIONS
 	memory used by fast-import during this run.  Showing this output
 	is currently the default, but can be disabled with --quiet.
 
---allow-unsafe-features::
-	Many command-line options can be provided as part of the
-	fast-import stream itself by using the `feature` or `option`
-	commands. However, some of these options are unsafe (e.g.,
-	allowing fast-import to access the filesystem outside of the
-	repository). These options are disabled by default, but can be
-	allowed by providing this option on the command line.  This
-	currently impacts only the `export-marks`, `import-marks`, and
-	`import-marks-if-exists` feature commands.
-+
-	Only enable this option if you trust the program generating the
-	fast-import stream! This option is enabled automatically for
-	remote-helpers that use the `import` capability, as they are
-	already trusted to run their own code.
-
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -352,13 +337,6 @@ and control the current import process.  More detailed discussion
 	`commit` command.  This command is optional and is not
 	needed to perform an import.
 
-`alias`::
-	Record that a mark refers to a given object without first
-	creating any new object.  Using --import-marks and referring
-	to missing marks will cause fast-import to fail, so aliases
-	can provide a way to set otherwise pruned commits to a valid
-	value (e.g. the nearest non-pruned ancestor).
-
 `checkpoint`::
 	Forces fast-import to close the current packfile, generate its
 	unique SHA-1 checksum and index, and start a new packfile.
@@ -413,7 +391,7 @@ change to the project.
 	('encoding' SP <encoding>)?
 	data
 	('from' SP <commit-ish> LF)?
-	('merge' SP <commit-ish> LF)*
+	('merge' SP <commit-ish> LF)?
 	(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
 	LF?
 ....
@@ -796,7 +774,6 @@ lightweight (non-annotated) tags see the `reset` command below.
 
 ....
 	'tag' SP <name> LF
-	mark?
 	'from' SP <commit-ish> LF
 	original-oid?
 	'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
@@ -936,21 +913,6 @@ a data chunk which does not have an LF as its last byte.
 +
 The `LF` after `<delim> LF` is optional (it used to be required).
 
-`alias`
-~~~~~~~
-Record that a mark refers to a given object without first creating any
-new object.
-
-....
-	'alias' LF
-	mark
-	'to' SP <commit-ish> LF
-	LF?
-....
-
-For a detailed description of `<commit-ish>` see above under `from`.
-
-
 `checkpoint`
 ~~~~~~~~~~~~
 Forces fast-import to close the current packfile, start a new one, and to