X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-revert.txt;h=3457c4078781d15f9b292d807119f28eee46866c;hb=4356736571c6845cb446e4a7c9d645868e558ca0;hp=71f7815d65a38db70a5176a50989300b39684cda;hpb=38ebbacd93eb547b3608b64a2efc60fd79e1ea85;p=git.git

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 71f7815d6..3457c4078 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
 -----------
@@ -19,12 +19,21 @@ 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].
 
 -e|--edit::
 	With this option, `git-revert` will let you edit the commit
 	message prior 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.
@@ -54,4 +63,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-