X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=c672277df25a6855e09e642cdf6341841b4dd5a3;hb=ef29c11702594e616cf43bea260515d9f14f17b0;hp=b3b2c4dd28c4f1a8f14948e5d1262dd71f1e96cf;hpb=0fe7c1de16f71312e6adac4b85bddf0d62a47168;p=git.git diff --git a/diff.h b/diff.h index b3b2c4dd..c672277d 100644 --- a/diff.h +++ b/diff.h @@ -28,9 +28,12 @@ struct diff_options { with_raw:1, with_stat:1, tree_in_recursive:1, + binary:1, full_index:1, silent_on_remove:1, - find_copies_harder:1; + find_copies_harder:1, + summary:1; + int context; int break_opt; int detect_rename; int line_termination; @@ -150,6 +153,7 @@ extern int diff_queue_is_empty(void); #define DIFF_FORMAT_NAME 4 #define DIFF_FORMAT_NAME_STATUS 5 #define DIFF_FORMAT_DIFFSTAT 6 +#define DIFF_FORMAT_CHECKDIFF 7 extern void diff_flush(struct diff_options*);