summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-08 23:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 23:50:14 (GMT)
commit674b28085e89c3be37d07063b253069101669b55 (patch)
tree9e5970f891249c82937912730065fdd3eaf059a1
parentd9722174573fc657c9b6c4adde6165d65c4e8de6 (diff)
downloadgit-674b28085e89c3be37d07063b253069101669b55.zip
git-674b28085e89c3be37d07063b253069101669b55.tar.gz
git-674b28085e89c3be37d07063b253069101669b55.tar.bz2
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>
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-revert.txt4
-rwxr-xr-xgit-revert.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 744f2c9..4f323fa 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 f471037..e27c680 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 5cb02b1..9d499c4 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)