pull: support pull.ff config

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 19063ebc64af2378d69b31933367a0d01d8a2630..6fa2205734e435c9db787193dcf8c0392d9d2a24 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -355,7 +355,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
 }
 
 static const char * const ls_files_usage[] = {
-       N_("git ls-files [options] [<file>...]"),
+       N_("git ls-files [<options>] [<file>...]"),
        NULL
 };