diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-28 17:57:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-28 17:57:45 -0700 |
| commit | 933693da77857b12ba86d999a601dbdb8ab212ff (patch) | |
| tree | 7c35b415052a6e814dfb0d93db150ca41ab84bec /git-commit-script | |
| parent | 0f583175317a1c5c57b56c87856fbe46c3f3c296 (diff) | |
| parent | 9847f7e0db8359b3932fd51290d777610090c33f (diff) | |
| download | git-933693da77857b12ba86d999a601dbdb8ab212ff.tar.gz | |
Merge refs/heads/master from .
Diffstat (limited to 'git-commit-script')
| -rwxr-xr-x | git-commit-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit-script b/git-commit-script index e47a090c97..4987e37861 100755 --- a/git-commit-script +++ b/git-commit-script @@ -195,8 +195,8 @@ else fi if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ] then - sed -ne '/^#/p' .editmsg - rm .editmsg + rm -f .editmsg + git-status-script exit 1 fi case "$no_edit" in |