Windows: A rudimentary poll() emulation.

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 8081bbaffa8d3710b644c744b9f81d459938a20e..5b49b813862c5318701e40f1a798ca04cd1d3a63 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -7,7 +7,7 @@ git-revert - Revert an existing commit
 
 SYNOPSIS
 --------
-'git-revert' [--edit | --no-edit] [-n] <commit>
+'git-revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>
 
 DESCRIPTION
 -----------
@@ -20,18 +20,28 @@ OPTIONS
 <commit>::
        Commit to revert.
        For a more complete list of ways to spell commit names, see
-       "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+       "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
--e|--edit::
+-e::
+--edit::
        With this option, `git-revert` will let you edit the commit
-       message prior committing the revert. This is the default if
+       message prior to committing the revert. This is the default if
        you run the command from a terminal.
 
+-m parent-number::
+--mainline parent-number::
+       Usually you cannot revert a merge because you do not know which
+       side of the merge should be considered the mainline.  This
+       option specifies the parent number (starting from 1) of
+       the mainline and allows revert to reverse the change
+       relative to the specified parent.
+
 --no-edit::
        With this option, `git-revert` will not start the commit
        message editor.
 
--n|--no-commit::
+-n::
+--no-commit::
        Usually the command automatically creates a commit with
        a commit log message stating which commit was reverted.
        This flag applies the change necessary to revert the
@@ -44,6 +54,10 @@ OPTIONS
 This is useful when reverting more than one commits'
 effect to your working tree in a row.
 
+-s::
+--signoff::
+       Add Signed-off-by line at the end of the commit message.
+
 
 Author
 ------
@@ -55,5 +69,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite