X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=32b4780173d78bfd0e77a37f82df4a59aa502ec1;hb=650e4be59b9f385f56e5829d97d09e8440f174b8;hp=12590791cbefe8717891365b6d417f60c51f684f;hpb=50b8e355b64c93a71d5008557e15f52c032240ff;p=git.git diff --git a/diff.h b/diff.h index 12590791..32b47801 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; @@ -76,6 +77,7 @@ extern int diff_scoreopt_parse(const char *opt); #define DIFF_SETUP_USE_CACHE 2 #define DIFF_SETUP_USE_SIZE_CACHE 4 +extern int git_diff_config(const char *var, const char *value); extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int); extern int diff_setup_done(struct diff_options *); @@ -96,6 +98,7 @@ extern void diffcore_std_no_resolve(struct diff_options *); " -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" \