X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=f783baef14604678d1e638cc766bffdbdc43f691;hb=e6bfaf3e33beba9431490a4f5c7a9753986554c4;hp=236095fc9a1a6ffc056be8616c0f83e4e8c7ec2f;hpb=72c159f642a33255b76fff512f2a8c3aff9f5dca;p=git.git diff --git a/diff.h b/diff.h index 236095fc..f783baef 100644 --- a/diff.h +++ b/diff.h @@ -25,6 +25,7 @@ struct diff_options { const char *pickaxe; unsigned recursive:1, with_raw:1, + with_stat:1, tree_in_recursive:1, full_index:1; int break_opt; @@ -119,6 +120,9 @@ extern void diffcore_std_no_resolve(struct diff_options *); " -u synonym for -p.\n" \ " --patch-with-raw\n" \ " output both a patch and the diff-raw format.\n" \ +" --stat show diffstat instead of patch.\n" \ +" --patch-with-stat\n" \ +" output a patch and prepend its diffstat.\n" \ " --name-only show only names of changed files.\n" \ " --name-status show names and status of changed files.\n" \ " --full-index show full object name on index lines.\n" \ @@ -142,6 +146,7 @@ extern int diff_queue_is_empty(void); #define DIFF_FORMAT_NO_OUTPUT 3 #define DIFF_FORMAT_NAME 4 #define DIFF_FORMAT_NAME_STATUS 5 +#define DIFF_FORMAT_DIFFSTAT 6 extern void diff_flush(struct diff_options*);