summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b96524f)
raw | patch | inline | side by side (parent: b96524f)
author | Junio C Hamano <gitster@pobox.com> | |
Sat, 6 Dec 2008 01:54:11 +0000 (17:54 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 8 Dec 2008 03:08:23 +0000 (19:08 -0800) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c | patch | blob | history |
diff --git a/read-cache.c b/read-cache.c
index 8579663ee09b1e01cf5228bd8be7c5eb371c5d31..c14b56231379b1aeaa5f648d208d77ab68818d94 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
/*
* Read the index file that is potentially unmerged into given
- * index_state, dropping any unmerged entries. Returns true is
+ * index_state, dropping any unmerged entries. Returns true if
* the index is unmerged. Callers who want to refuse to work
* from an unmerged state can call this and check its return value,
* instead of calling read_cache().