diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
| commit | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb (patch) | |
| tree | 09d2fd4312b16cb841238edd2b5ad3a10b6f5263 /git-commit.sh | |
| parent | 1f330269371cc77b7abfcc99c7b15ad7b86f09c9 (diff) | |
| parent | ce88ac5b129dd562a1062522039366ebbf1157e1 (diff) | |
| download | git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.gz | |
Merge branch 'pb/error'
* pb/error:
usage: minimum type fix.
Customizable error handlers
git-merge: Don't use -p when outputting summary
git-commit: allow -e option anywhere on command line
patch-id: take "commit" prefix as well as "diff-tree" prefix
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh index 6dd04fd367..e74fe640b8 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -199,6 +199,7 @@ only= logfile= use_commit= amend= +edit_flag= no_edit= log_given= log_message= @@ -246,7 +247,7 @@ do shift ;; -e|--e|--ed|--edi|--edit) - no_edit= + edit_flag=t shift ;; -i|--i|--in|--inc|--incl|--inclu|--includ|--include) @@ -384,6 +385,7 @@ $1" ;; esac done +case "$edit_flag" in t) no_edit= ;; esac ################################################################ # Sanity check options |