git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/diffcore.h b/diffcore.h
index 5b634585e8970de81067b9807d8813c083b86b0a..66687c3fe5ea4552cff2b864b73696460ca40b1e 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -42,6 +42,7 @@ struct diff_filespec {
 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
        unsigned should_free : 1; /* data should be free()'ed */
        unsigned should_munmap : 1; /* data should be munmap()'ed */
+       unsigned dirty_submodule : 1;  /* For submodules: its work tree is dirty */
 
        struct userdiff_driver *driver;
        /* data should be considered "binary"; -1 means "don't know yet" */