Merge branch 'js/rebase-i-dedup-call-to-rerere'

diff --git a/builtin/diff.c b/builtin/diff.c
index 343c6b8f2522a295a6148434572e77a3a3c5a16b..b7a9405d9fbec46edf99637557d7499fb58c4d77 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -320,6 +320,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                gitmodules_config();
        init_diff_ui_defaults();
        git_config(git_diff_ui_config, NULL);
+       precompose_argv(argc, argv);
 
        init_revisions(&rev, prefix);