diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-04-25 16:45:58 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-07 13:04:48 +0900 |
| commit | 80f537f79c16efeb7b92b3409ede434a230b5679 (patch) | |
| tree | 28b73ceb285fde7cec4ef84c4b685534887397c3 /Documentation/git-commit.txt | |
| parent | fc991b43df83ee32a92b9d906e77276e5dbd639c (diff) | |
| download | git-80f537f79c16efeb7b92b3409ede434a230b5679.tar.gz | |
doc: promote "git restore"
The new command "git restore" (together with "git switch") are added
to avoid the confusion of one-command-do-all "git checkout" for new
users. They are also helpful to avoid ambiguous context.
For these reasons, promote it everywhere possible. This includes
documentation, suggestions/advice from other commands.
One nice thing about git-restore is the ability to restore
"everything", so it can be used in "git status" advice instead of both
"git checkout" and "git reset". The three commands suggested by "git
status" are add, rm and restore.
"git checkout" is also removed from "git help" (i.e. it's no longer
considered a commonly used command)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index a85c2c2a4c..7628193284 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -359,7 +359,7 @@ When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the "index" with 'git add'. A file can be reverted back, only in the index but not in the working tree, -to that of the last commit with `git reset HEAD -- <file>`, +to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, |