pull --rebase: exit early when the working directory is dirty

diff --git a/diff.h b/diff.h
index f2c77391a965bcc731de6478a6553cdc652319ec..3a02d38d12d94c39ff9ef3ab744ea7d157fb52b4 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -83,12 +83,12 @@ struct diff_options {
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
+       int warn_on_too_large_rename;
        int dirstat_percent;
        int setup;
        int abbrev;
        const char *prefix;
        int prefix_length;
-       const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;