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-reset.txt | 48 ++++++++--------------------- 1 file changed, 13 insertions(+), 35 deletions(-) (limited to 'third_party/git/Documentation/git-reset.txt') diff --git a/third_party/git/Documentation/git-reset.txt b/third_party/git/Documentation/git-reset.txt index 932080c55d2c..97e0544d9e1e 100644 --- a/third_party/git/Documentation/git-reset.txt +++ b/third_party/git/Documentation/git-reset.txt @@ -8,36 +8,34 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [-q] [] [--] ... -'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] [] -'git reset' (--patch | -p) [] [--] [...] +'git reset' [-q] [] [--] ... +'git reset' (--patch | -p) [] [--] [...] 'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [] DESCRIPTION ----------- -In the first three forms, copy entries from `` to the index. -In the last form, set the current branch head (`HEAD`) to ``, +In the first and second form, copy entries from `` to the index. +In the third form, set the current branch head (`HEAD`) to ``, optionally modifying index and working tree to match. The ``/`` defaults to `HEAD` in all forms. -'git reset' [-q] [] [--] ...:: -'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] []:: - These forms reset the index entries for all paths that match the - `` to their state at ``. (It does not affect - the working tree or the current branch.) +'git reset' [-q] [] [--] ...:: + This form resets the index entries for all `` to their + state at ``. (It does not affect the working tree or + the current branch.) + -This means that `git reset ` is the opposite of `git add -`. This command is equivalent to -`git restore [--source=] --staged ...`. +This means that `git reset ` is the opposite of `git add +`. This command is equivalent to +`git restore [--source=] --staged ...`. + -After running `git reset ` to update the index entry, you can +After running `git reset ` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' (--patch | -p) [] [--] [...]:: +'git reset' (--patch | -p) [] [--] [...]:: Interactively select hunks in the difference between the index and `` (defaults to `HEAD`). The chosen hunks are applied in reverse to the index. @@ -103,26 +101,6 @@ OPTIONS `reset.quiet` config option. `--quiet` and `--no-quiet` will override the default behavior. ---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