From: Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>
Date: Thu, 8 Dec 2005 23:28:05 +0000 (+0100)
Subject: Add documentation for git-revert and git-cherry-pick.
X-Git-Tag: v0.99.9m^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=674b28085e89c3be37d07063b253069101669b55;p=git

Add documentation for git-revert and git-cherry-pick.

* Added the -e option to the documentation of git-cherry-pick.
* Added the -e and --no-commit option to git-revert.
* Removed redundant case expression for -n as --no-edit (already taken by
  --no-commit).

Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 744f2c9ce2..4f323fa42a 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -20,7 +20,7 @@ OPTIONS
 <commit>::
 	Commit to cherry-pick.
 
---edit::
+-e|--edit::
 	With this option, `git-cherry-pick` will let you edit the commit
 	message prior committing.
 
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index f471037b97..e27c6808b3 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -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
diff --git a/git-revert.sh b/git-revert.sh
index 5cb02b1ec2..9d499c4807 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -38,7 +38,7 @@ do
 	-e|--e|--ed|--edi|--edit)
 		edit=-e
 		;;
-	-n|--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+	--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
 		edit=
 		;;
 	-r|--r|--re|--rep|--repl|--repla|--replay)