diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:15 -0800 |
| commit | 3ed26a44b3415f5761bdab21f823d964c20a2824 (patch) | |
| tree | 332fe9b5ccddbdec65ab482e7d1100c57355f253 /userdiff.h | |
| parent | 18b26b18c50637eaa8fb1ae5f42fd94c8ac99507 (diff) | |
| parent | a64e6a44c63a965c5bc26242ddd3ed049b42e117 (diff) | |
| download | git-3ed26a44b3415f5761bdab21f823d964c20a2824.tar.gz git-3ed26a44b3415f5761bdab21f823d964c20a2824.tar.xz | |
Merge branch 'jk/more-comments-on-textconv'
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 */ |