Get rid of nasty utf-8 characters in printout

diff --git a/diff-files.c b/diff-files.c
index 4d60017e46b1aa54ea07a85b478592408dc34233..ebaf235c52f570c3bbe90bbfd4ad7d9e805f476f 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,7 +7,9 @@
 #include "diff.h"
 
 static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
+"git-diff-files [-q] "
+"[<common diff options>] [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
 static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int detect_rename = 0;
@@ -45,7 +47,7 @@ int main(int argc, const char **argv)
        int i;
 
        while (1 < argc && argv[1][0] == '-') {
-               if (!strcmp(argv[1], "-p"))
+               if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
                        diff_output_format = DIFF_FORMAT_PATCH;
                else if (!strcmp(argv[1], "-q"))
                        silent = 1;
@@ -55,6 +57,10 @@ int main(int argc, const char **argv)
                        ; /* no-op */
                else if (!strcmp(argv[1], "-z"))
                        diff_output_format = DIFF_FORMAT_MACHINE;
+               else if (!strcmp(argv[1], "--name-only"))
+                       diff_output_format = DIFF_FORMAT_NAME;
+               else if (!strcmp(argv[1], "--name-only-z"))
+                       diff_output_format = DIFF_FORMAT_NAME_Z;
                else if (!strcmp(argv[1], "-R"))
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                else if (!strncmp(argv[1], "-S", 2))