summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-17 15:25:51 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-17 15:25:52 -0800
commitabea4dc76a675d4ac0f27a2367256dc31981d1ca (patch)
tree07020dfe6fce37c742bc73700d651e117891a416 /diff.h
parentadbbc6f29121aee3aec383a9ac05092c79908033 (diff)
parent07924d4d50e5304fb53eb60aaba8aef31d4c4e5e (diff)
downloadgit-abea4dc76a675d4ac0f27a2367256dc31981d1ca.tar.gz
Merge branch 'mp/diff-algo-config'
Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 76830e28b4..78b4091dd5 100644
--- a/diff.h
+++ b/diff.h
@@ -336,6 +336,8 @@ extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
extern int parse_rename_score(const char **cp_p);
+extern long parse_algorithm_value(const char *value);
+
extern int print_stat_summary(FILE *fp, int files,
int insertions, int deletions);
extern void setup_diff_pager(struct diff_options *);