[PATCH] revert/cherry-pick: two minor fixes

[PATCH] revert/cherry-pick: two minor fixes

[Junio C Hamano]

Earlier it was noticed that revert has two seemingly overlapping
options, --no-commit and --no-edit.  An ambiguious option,
e.g. "--no", is interpreted as --no-commit.  It was consistent
because the documentation did not advertise the abbreviated
form, --no-edit, anyway, but that did not change the fact that
the case arm to handle --no-edit contained useless choices.

Linus asked to change cherry-pick's default not to record the
original commit object name (i.e. make -r the default).  This
patch introduces a new option, --record-original, for people who
might prefer the command to record it.

Sometime in the near future, we would change the default not to
record the original commit, but not yet.

Update the documentation to match the above change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/git-cherry-pick.txt |   18 +++++++++++-------
 git-revert.sh                     |    8 ++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index bfa950c..c2a2c27 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change intro
 
 SYNOPSIS
 --------
-'git-cherry-pick' [--edit] [-n] [-r] <commit>
+'git-cherry-pick' [--edit] [-n] [--record-original] [-r] <commit>
 
 DESCRIPTION
 -----------
@@ -24,13 +24,17 @@ OPTIONS
 	With this option, `git-cherry-pick` will let you edit the commit
 	message prior committing.
 
--r|--replay::
-	Usually the command appends which commit was
+--record-original::
+	With this option, the command appends which commit was
 	cherry-picked after the original commit message when
-	making a commit.  This option, '--replay', causes it to
-	use the original commit message intact.  This is useful
-	when you are reordering the patches in your private tree
-	before publishing.
+	making a commit.
++
+This behaviour is still the default, and another option, `-r`,
+is used to turn it off.  The plan is to make `-r` the default in
+the near future.
+
+-r|--replay::
+	See `--record-original`.
 
 -n|--no-commit::
 	Usually the command automatically creates a commit with
diff --git a/git-revert.sh b/git-revert.sh
index 2bf35d1..179135b 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -12,7 +12,8 @@ case "$0" in
 *-cherry-pick* )
 	edit=
 	me=cherry-pick
-	USAGE='[--edit] [-n] [-r] <commit-ish>'  ;;
+	replay=
+	USAGE='[--edit] [-n] [--record-original] <commit-ish>'  ;;
 * )
 	die "What are you talking about?" ;;
 esac
@@ -29,12 +30,15 @@ do
 	-e|--e|--ed|--edi|--edit)
 		edit=-e
 		;;
-	--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+	--no-e|--no-ed|--no-edi|--no-edit)
 		edit=
 		;;
 	-r|--r|--re|--rep|--repl|--repla|--replay)
 		replay=t
 		;;
+	--record-original)
+		replay=
+		;;
 	-*)
 		usage
 		;;
-- 
1.4.2.gb0ae