diff options
Diffstat (limited to 'diff-files.c')
| -rw-r--r-- | diff-files.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c index b840b35d1..f3a79e5c0 100644 --- a/diff-files.c +++ b/diff-files.c @@ -16,6 +16,7 @@ static int diff_score_opt = 0; static const char *pickaxe = NULL; static int pickaxe_opts = 0; static int diff_break_opt = -1; +static const char *orderfile = NULL; static int silent = 0; static void show_unmerge(const char *path) @@ -56,6 +57,8 @@ int main(int argc, const char **argv) diff_setup_opt |= DIFF_SETUP_REVERSE; else if (!strncmp(argv[1], "-S", 2)) pickaxe = argv[1] + 2; + else if (!strncmp(argv[1], "-O", 2)) + orderfile = argv[1] + 2; else if (!strcmp(argv[1], "--pickaxe-all")) pickaxe_opts = DIFF_PICKAXE_ALL; else if (!strncmp(argv[1], "-B", 2)) @@ -122,7 +125,8 @@ int main(int argc, const char **argv) diffcore_std((1 < argc) ? argv + 1 : NULL, detect_rename, diff_score_opt, pickaxe, pickaxe_opts, - diff_break_opt); + diff_break_opt, + orderfile); diff_flush(diff_output_format, 1); return 0; } |