Merge 1.5.5.4 in

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 69db4984473fae7928797bcfb13baf1f0e39d851..5e6adfcea378771c19bb79563463875c6e7f513e 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,13 +20,20 @@ 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::
        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.
@@ -44,6 +51,9 @@ 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,4 +65,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