diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
| commit | 2f91bcfa9d8d1f443012e3e92092f464f3bb3557 (patch) | |
| tree | 1813dc04efc420f0ece0b29481628d22831dd258 /userdiff.h | |
| parent | Merge branch 'js/maint-fetch-update-head' (diff) | |
| parent | diff: add filter for converting binary to text (diff) | |
| download | tgif-2f91bcfa9d8d1f443012e3e92092f464f3bb3557.tar.xz | |
Merge branch 'jk/diff-convfilter'
* jk/diff-convfilter:
diff: add filter for converting binary to text
diff: introduce diff.<driver>.binary
diff: unify external diff and funcname parsing code
t4012: use test_cmp instead of cmp
Diffstat (limited to 'userdiff.h')
| -rw-r--r-- | userdiff.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/userdiff.h b/userdiff.h new file mode 100644 index 0000000000..f29c18ffb3 --- /dev/null +++ b/userdiff.h @@ -0,0 +1,22 @@ +#ifndef USERDIFF_H +#define USERDIFF_H + +struct userdiff_funcname { + const char *pattern; + int cflags; +}; + +struct userdiff_driver { + const char *name; + const char *external; + int binary; + struct userdiff_funcname funcname; + const char *textconv; +}; + +int userdiff_config_basic(const char *k, const char *v); +int userdiff_config_porcelain(const char *k, const char *v); +struct userdiff_driver *userdiff_find_by_name(const char *name); +struct userdiff_driver *userdiff_find_by_path(const char *path); + +#endif /* USERDIFF */ |