X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-reset.txt;h=645f0c17485d35e6696be950fc61f5fdcf3dd14e;hb=3e7f1e6ccbfdc652539caba61b9be40c5dd89793;hp=58d9b4c062d6d6d09f10fd2fad1edabddd961d92;hpb=812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2;p=git.git diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 58d9b4c06..645f0c174 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -53,9 +53,12 @@ OPTIONS and the current commit in the working tree. --keep:: - Resets the index to match the tree recorded by the named commit, - but keep changes in the working tree. Aborts if the reset would - change files that are already modified in the working tree. + Reset the index to the given commit, keeping local changes in + the working tree since the current commit, while updating + working tree files without local changes to what appears in + the given commit. If a file that is different between the + current commit and the given commit has local changes, reset + is aborted. -p:: --patch::