From 8bf14d6ef9245f3b81d24cb7725a868f62343277 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@suse.cz>
Date: Sat, 26 Nov 2005 23:12:44 +0100
Subject: Document the --(no-)edit switch of git-revert and git-cherry-pick

This switch was not documented properly. I decided not to mention
the --no-edit switch in the git-cherry-pick documentation since
we always default to no editing.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-revert.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'git-revert.sh')

diff --git a/git-revert.sh b/git-revert.sh
index c1aebb159c..5cb02b1ec2 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -19,10 +19,10 @@ esac
 usage () {
 	case "$me" in
 	cherry-pick)
-		die "usage git $me [-n] [-r] <commit-ish>"
+		die "usage git $me [--edit] [-n] [-r] <commit-ish>"
 		;;
 	revert)
-		die "usage git $me [-n] <commit-ish>"
+		die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
 		;;
 	esac
 }
-- 
cgit v1.2.3


From 674b28085e89c3be37d07063b253069101669b55 Mon Sep 17 00:00:00 2001
From: Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>
Date: Fri, 9 Dec 2005 00:28:05 +0100
Subject: 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>
---
 git-revert.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-revert.sh')

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)
-- 
cgit v1.2.3