projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Plug memory leak in write_sha1_to_fd()
[git.git]
/
git-commit-script
diff --git
a/git-commit-script
b/git-commit-script
index
dae487f
..
1d59f46
100755
(executable)
--- a/
git-commit-script
+++ b/
git-commit-script
@@
-6,7
+6,7
@@
. git-sh-setup-script || die "Not a git archive"
usage () {
. git-sh-setup-script || die "Not a git archive"
usage () {
- die 'git commit [-m existing-commit] [<path>...]'
+ die 'git commit [-
-all] [-
m existing-commit] [<path>...]'
}
files=()
}
files=()
@@
-86,7
+86,7
@@
else
fi >.editmsg
git-status-script >>.editmsg
fi
fi >.editmsg
git-status-script >>.editmsg
fi
-if [ "$?" != "0" ]
+if [ "$?" != "0"
-a ! -f $GIT_DIR/MERGE_HEAD
]
then
cat .editmsg
rm .editmsg
then
cat .editmsg
rm .editmsg