summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-29 21:51:26 -0700
committerJunio C Hamano <junkio@cox.net>2005-08-29 21:51:26 -0700
commit706df00d6864201bdb90a2f3b26443a65ae538ff (patch)
tree51a9c4cc0b88cd2a61877cc4280bdfc27150338f /git-commit-script
parent7a034337420a45395b3f68a1f12ca53d8b0652be (diff)
parent3459c2c433ac46eac596810d2ef2c3d4ef949852 (diff)
downloadgit-706df00d6864201bdb90a2f3b26443a65ae538ff.tar.gz
Merge refs/heads/master from .
Diffstat (limited to 'git-commit-script')
-rwxr-xr-xgit-commit-script3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-commit-script b/git-commit-script
index 4987e37861..cd28dde64d 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -64,6 +64,9 @@ do
use_commit="$1"
no_edit=t
shift ;;
+ -e|--e|--ed|--edi|--edit)
+ no_edit=
+ shift ;;
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
signoff=t
shift ;;