commit 7da3b7f66ccdeea3e534a7c8d027f25521df8a8a
from: Stefan Sperling
date: Thu Aug 08 16:42:02 2019 UTC
sync man page
commit - fc62dacd88663035e71fd2a30864a88216793660
commit + 7da3b7f66ccdeea3e534a7c8d027f25521df8a8a
blob - a9b70f335fa31d7d78766517b5f65224a4dbbc42
blob + 242033be16d58ec6ad90ebb371a41049dc68e213
--- got.1.html
+++ got.1.html
@@ -560,7 +560,9 @@
rm
Short alias for remove
.
revert
- file-path ...
+ [-p
] [-F
+ response-script] [-R
]
+ path ...
Revert any uncommited changes in files at the specified paths. File
contents will be overwritten with those contained in the work tree's base
commit. There is no way to bring discarded changes back after
@@ -568,6 +570,28 @@
If a file was added with got add
it
will become an unversioned file again. If a file was deleted with
got remove
it will be restored.
+ The options for got revert
are as
+ follows:
+
+ -p
+ - Instead of reverting all changes in files, interactively select or
+ reject changes to revert based on “y” (revert change),
+ “n” (keep change), and “q” (quit reverting
+ this file) responses. If a file is in modified status, individual
+ patches derived from the modified file content can be reverted. Files
+ in added or deleted status may only be reverted in their
+ entirety.
+ -F
+ response-script
+ - With the
-p
option, read “y”,
+ “n”, and “q” responses line-by-line from
+ the specified response-script file instead of
+ prompting interactively.
+ -R
+ - Permit recursion into directories. If this option is not specified,
+
got revert
will refuse to run if a specified
+ path is a directory.
+
rv
Short alias for revert
.
@@ -987,7 +1011,7 @@
along with the IDs of staged blob objects and stage status codes. If
paths were provided in the command line show the staged paths among
the specified paths. Otherwise, show all staged paths.
- -p
+ -p
Instead of staging the entire content of a changed file, interactively
select or reject changes for staging based on “y” (stage
change), “n” (reject change), and “q”
@@ -995,7 +1019,7 @@
individual patches derived from the modified file content can be
staged. Files in added or deleted status may only be staged or
rejected in their entirety.
- -F
+ -F
response-script
With the -p
option, read “y”,
“n”, and “q” responses line-by-line from
@@ -1057,7 +1081,7 @@
The options for got unstage
are as
follows:
- -p
+ -p
- Instead of unstaging the entire content of a changed file,
interactively select or reject changes for unstaging based on
“y” (unstage change), “n” (keep change
@@ -1065,7 +1089,7 @@
If a file is staged in modified status, individual patches derived
from the staged file content can be unstaged. Files staged in added or
deleted status may only be unstaged in their entirety.
- -F
+ -F
response-script
- With the
-p
option, read “y”,
“n”, and “q” responses line-by-line from
@@ -1121,6 +1145,11 @@ Clone an existing Git repository for use with
$ got status
$ got diff | less
+Interactively revert selected local changes in a work tree
+ directory:
+
+$ got revert -p
+ -R .
In a work tree or a git repository directory, list all branch
references: