Merge branch 'mt/grep-submodules-working-tree'

diff --git a/unpack-trees.c b/unpack-trees.c
index cfe1c5ec6f3f6a686deb6a4a770f092a4dec3d06..62276d4fef5f67e7147377f16e24e30abca0906a 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -315,7 +315,7 @@ static struct progress *get_progress(struct unpack_trees_options *o)
                        total++;
        }
 
-       return start_delayed_progress(_("Checking out files"), total);
+       return start_delayed_progress(_("Updating files"), total);
 }
 
 static void setup_collided_checkout_detection(struct checkout *state,