about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/git-rev-parse.txt
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
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.
Diffstat (limited to 'third_party/git/Documentation/git-rev-parse.txt')
-rw-r--r--third_party/git/Documentation/git-rev-parse.txt10
1 files changed, 1 insertions, 9 deletions
diff --git a/third_party/git/Documentation/git-rev-parse.txt b/third_party/git/Documentation/git-rev-parse.txt
index 19b12b6d43ce..e72d332b8316 100644
--- a/third_party/git/Documentation/git-rev-parse.txt
+++ b/third_party/git/Documentation/git-rev-parse.txt
@@ -262,8 +262,7 @@ print a message to stderr and exit with nonzero status.
 	directory.
 
 --show-toplevel::
-	Show the absolute path of the top-level directory of the working
-	tree. If there is no working tree, report an error.
+	Show the absolute path of the top-level directory.
 
 --show-superproject-working-tree::
 	Show the absolute path of the root of the superproject's
@@ -275,13 +274,6 @@ print a message to stderr and exit with nonzero status.
 	Show the path to the shared index file in split index mode, or
 	empty if not in split-index mode.
 
---show-object-format[=(storage|input|output)]::
-	Show the object format (hash algorithm) used for the repository
-	for storage inside the `.git` directory, input, or output. For
-	input, multiple algorithms may be printed, space-separated.
-	If not specified, the default is "storage".
-
-
 Other Options
 ~~~~~~~~~~~~~