X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-revert.txt;h=93e20f7752f0d48faca153eef144845b2db9ce1d;hb=7064ca51b08304d56bf57d2cceb2884f1abf66e5;hp=69db4984473fae7928797bcfb13baf1f0e39d851;hpb=f8db7884286232274c8e7c7d82a35a2478b097d3;p=git.git

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 69db49844..93e20f775 100644
--- 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] <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.
@@ -55,4 +62,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[7] suite