Merge branch 'maint'

diff --git a/builtin-runstatus.c b/builtin-runstatus.c
index 7979d612912f629b83d96024d3402df005e53ca3..4b489b1214e1ae693a9b0b5166909800f5ca94ac 100644 (file)
--- a/builtin-runstatus.c
+++ b/builtin-runstatus.c
@@ -1,10 +1,10 @@
-#include "wt-status.h"
 #include "cache.h"
+#include "wt-status.h"
 
 extern int wt_status_use_color;
 
 static const char runstatus_usage[] =
-"git-runstatus [--color|--nocolor] [--amend] [--verbose]";
+"git-runstatus [--color|--nocolor] [--amend] [--verbose] [--untracked]";
 
 int cmd_runstatus(int argc, const char **argv, const char *prefix)
 {
@@ -25,6 +25,8 @@ int cmd_runstatus(int argc, const char **argv, const char *prefix)
                }
                else if (!strcmp(argv[i], "--verbose"))
                        s.verbose = 1;
+               else if (!strcmp(argv[i], "--untracked"))
+                       s.untracked = 1;
                else
                        usage(runstatus_usage);
        }