From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/Documentation/git-restore.txt | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'third_party/git/Documentation/git-restore.txt') diff --git a/third_party/git/Documentation/git-restore.txt b/third_party/git/Documentation/git-restore.txt index 5bf60d494341..1ab2e40ea938 100644 --- a/third_party/git/Documentation/git-restore.txt +++ b/third_party/git/Documentation/git-restore.txt @@ -8,9 +8,8 @@ git-restore - Restore working tree files SYNOPSIS -------- [verse] -'git restore' [] [--source=] [--staged] [--worktree] [--] ... -'git restore' [] [--source=] [--staged] [--worktree] --pathspec-from-file= [--pathspec-file-nul] -'git restore' (-p|--patch) [] [--source=] [--staged] [--worktree] [--] [...] +'git restore' [] [--source=] [--staged] [--worktree] ... +'git restore' (-p|--patch) [] [--source=] [--staged] [--worktree] [...] DESCRIPTION ----------- @@ -114,27 +113,6 @@ in linkgit:git-checkout[1] for details. appear in the `--source` tree are removed, to make them match `` exactly. The default is no-overlay mode. ---pathspec-from-file=:: - Pathspec is passed in `` instead of commandline args. If - `` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - -\--:: - Do not interpret any more arguments as options. - -...:: - Limits the paths affected by the operation. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. - EXAMPLES -------- -- cgit 1.4.1