diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-18 07:39:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 07:39:49 +0100 |
| commit | 78f111e12de40e2d9aa8d0774acc287f79862b13 (patch) | |
| tree | 1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb /builtin-commit.c | |
| parent | t5540: clarify that http-push does not handle packed-refs on the remote (diff) | |
| parent | builtin-fsck: fix off by one head count (diff) | |
| download | git-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.xz git-78f111e12de40e2d9aa8d0774acc287f79862b13.zip | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
builtin-fsck: fix off by one head count
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index e88b78f811..977ea09c51 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -624,7 +624,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix) if (!commitable && !in_merge && !allow_empty && !(amend && is_a_merge(head_sha1))) { run_status(stdout, index_file, prefix, 0); - unlink(commit_editmsg); return 0; } |