aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-27 19:24:36 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-27 19:24:36 -0800
commit2d2b3fd8485eee6dd238b930f2592535730089a4 (patch)
tree642dc8866db7840ef247164bee3435cf805ee03e /Documentation
parent14de7393f1eca05c99f785cc2f43281da2c46e9e (diff)
parent7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 (diff)
downloadgit-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.gz
git-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.xz
Merge branch 'rs/strbuf-expand'
* rs/strbuf-expand: remove the unused files interpolate.c and interpolate.h daemon: deglobalize variable 'directory' daemon: inline fill_in_extra_table_entries() daemon: use strbuf_expand() instead of interpolate() merge-recursive: use strbuf_expand() instead of interpolate() add strbuf_expand_dict_cb(), a helper for simple cases
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/technical/api-strbuf.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt
index a9668e5f2..a8ee2fe6a 100644
--- a/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@ -205,6 +205,13 @@ In order to facilitate caching and to make it possible to give
parameters to the callback, `strbuf_expand()` passes a context pointer,
which can be used by the programmer of the callback as she sees fit.
+`strbuf_expand_dict_cb`::
+
+ Used as callback for `strbuf_expand()`, expects an array of
+ struct strbuf_expand_dict_entry as context, i.e. pairs of
+ placeholder and replacement string. The array needs to be
+ terminated by an entry with placeholder set to NULL.
+
`strbuf_addf`::
Add a formatted string to the buffer.