diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:43 -0800 |
| commit | aa6c22ec43fa9e2ac531360b5f274446e27d8be1 (patch) | |
| tree | 7459843cf85a3b6182bcec2f30c7b6fd36b73165 /userdiff.h | |
| parent | 6044329cf14e922aad270778db88767e97147875 (diff) | |
| parent | a64e6a44c63a965c5bc26242ddd3ed049b42e117 (diff) | |
| download | git-aa6c22ec43fa9e2ac531360b5f274446e27d8be1.tar.gz git-aa6c22ec43fa9e2ac531360b5f274446e27d8be1.tar.xz | |
Merge branch 'jk/more-comments-on-textconv' into maint
The memory ownership rule of fill_textconv() API, which was a bit
tricky, has been documented a bit better.
* jk/more-comments-on-textconv:
diff: clarify textconv interface
Diffstat (limited to 'userdiff.h')
| -rw-r--r-- | userdiff.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/userdiff.h b/userdiff.h index 4a7e78ffb..2ef0ce545 100644 --- a/userdiff.h +++ b/userdiff.h @@ -23,6 +23,10 @@ int userdiff_config(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); +/* + * Initialize any textconv-related fields in the driver and return it, or NULL + * if it does not have textconv enabled at all. + */ struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver); #endif /* USERDIFF */ |