Merge branch 'jk/status-read-branch-name-fix'

diff --git a/builtin/mv.c b/builtin/mv.c
index 8883baa903e92093cabcc3dbaac7ccec3eecd64a..d1d43168ae79d0157f8adf9dc36a4d2683afe91b 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -3,8 +3,8 @@
  *
  * Copyright (C) 2006 Johannes Schindelin
  */
-#include "cache.h"
 #include "builtin.h"
+#include "lockfile.h"
 #include "dir.h"
 #include "cache-tree.h"
 #include "string-list.h"
@@ -12,7 +12,7 @@
 #include "submodule.h"
 
 static const char * const builtin_mv_usage[] = {
-       N_("git mv [options] <source>... <destination>"),
+       N_("git mv [<options>] <source>... <destination>"),
        NULL
 };