Update diff-options and config documentation.

diff --git a/builtin-diff.c b/builtin-diff.c
index 47e0a37e212d9a7085714d1b5d6d8f2ffda8d5a6..d520c7ca294fcd8e619135bfe8932650d850724c 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -254,8 +254,10 @@ int cmd_diff(int argc, const char **argv, char **envp)
        init_revisions(&rev);
 
        argc = setup_revisions(argc, argv, &rev, NULL);
-       if (!rev.diffopt.output_format)
+       if (!rev.diffopt.output_format) {
                rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+               diff_setup_done(&rev.diffopt);
+       }
 
        /* Do we have --cached and not have a pending object, then
         * default to HEAD by hand.  Eek.