X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=9b2e1e62bbe6f621d2d39ec7707eccd75ff76aac;hb=acf59575cac330f3a505247dd7a9d6551a2a9cf8;hp=51155479a46857ee03aa5f5e005abdad63db5495;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/diff.h b/diff.h index 51155479..9b2e1e62 100644 --- a/diff.h +++ b/diff.h @@ -32,7 +32,8 @@ struct diff_options { const char *orderfile; const char *pickaxe; unsigned recursive:1, - tree_in_recursive:1; + tree_in_recursive:1, + full_index:1; int break_opt; int detect_rename; int find_copies_harder; @@ -91,12 +92,12 @@ extern void diffcore_std_no_resolve(struct diff_options *); #define COMMON_DIFF_OPTIONS_HELP \ "\ncommon diff options:\n" \ -" -r diff recursively (only meaningful in diff-tree)\n" \ " -z output diff-raw with lines terminated with NUL.\n" \ " -p output patch format.\n" \ " -u synonym for -p.\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 ines.\n" \ " -R swap input file pairs.\n" \ " -B detect complete rewrites.\n" \ " -M detect renames.\n" \