Merge branch 'js/c-merge-recursive'

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index f471037b97ad72fc098859e60ccfeb75b559d3a3..71f7815d65a38db70a5176a50989300b39684cda 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -3,7 +3,7 @@ git-revert(1)
 
 NAME
 ----
-git-revert - Revert an existing commit.
+git-revert - Revert an existing commit
 
 SYNOPSIS
 --------
@@ -20,7 +20,7 @@ OPTIONS
 <commit>::
        Commit to revert.
 
---edit::
+-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.
@@ -29,7 +29,7 @@ OPTIONS
        With this option, `git-revert` will not start the commit
        message editor.
 
--n::
+-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