Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
contrib: update packinfo.pl to not use dashed commands
[gitweb.git]
/
builtin-commit.c
diff --git
a/builtin-commit.c
b/builtin-commit.c
index c870037b07ca00aeeeb369fdae98c9b828be0af2..e2a7e48b1ce97a74ef73a1feb53a9b9248cf8668 100644
(file)
--- a/
builtin-commit.c
+++ b/
builtin-commit.c
@@
-639,7
+639,7
@@
static int prepare_to_commit(const char *index_file, const char *prefix)
active_cache_tree = cache_tree();
if (cache_tree_update(active_cache_tree,
active_cache, active_nr, 0, 0) < 0) {
- error("Error building trees");
+ error("Error building trees
; the index is unmerged?
");
return 0;
}