rebase --rebase-merges: root commits can be cousins, too

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 7700907f1b2c169dfb969d255cd9d61953cfb9f4..78e66b998664ee23244fd9fc9acd33578b9c53c0 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1593,7 +1593,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
        /*
         * Get rid of the idx file as we do not need it anymore.
         * NEEDSWORK: extract this bit from free_pack_by_name() in
-        * sha1_file.c, perhaps?  It shouldn't matter very much as we
+        * sha1-file.c, perhaps?  It shouldn't matter very much as we
         * know we haven't installed this pack (hence we never have
         * read anything from it).
         */