commit 37b56b1f656c6949d92725817bd408e6d0c25fe4 from: Stefan Sperling date: Wed Aug 07 16:34:42 2019 UTC sync man page commit - e0ed36ae557725ae2d42635cf55b09396ebbef58 commit + 37b56b1f656c6949d92725817bd408e6d0c25fe4 blob - 7918d874e9b5e72047228847d761f793c8b49830 blob + 693914f46a634ffdb7fc2ceb316d3f3119c4f917 --- got.1.html +++ got.1.html @@ -940,7 +940,8 @@
Short alias for histedit.
[-l] [-p] - [-F] [path ...]
+ [-F response-script] + [path ...]
Stage local changes for inclusion in the next commit. If no path is specified, stage all changes in the work tree. Otherwise, stage changes at or within the specified paths. Paths may @@ -994,10 +995,10 @@ from the modified file content can be staged. Files in added or deleted status may be staged or rejected in their entirety.
- path
-
With the -p option, read responses - line-by-line from a script file at the specified - path instead of prompting interactively.
+ response-script +
With the -p option, read “y”, + “n”, and “q” responses line-by-line from a + script file instead of prompting interactively.

got stage will refuse to run if certain preconditions are not met. If a file contains merge conflicts,