summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-06 14:50:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-06 14:50:46 -0700
commitae722b4e2796522261b0f130eb86b665499625e6 (patch)
tree95dc131c0b1e306b7f1206f1ea3e179547290171 /Documentation
parentMerge branch 'jc/conflict-marker-size' (diff)
parentfmt-merge-msg: hide summary option (diff)
downloadtgif-ae722b4e2796522261b0f130eb86b665499625e6.tar.xz
Merge branch 'sb/fmt-merge-msg'
* sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/technical/api-string-list.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
index 293bb15d20..6d8c24bb1e 100644
--- a/Documentation/technical/api-string-list.txt
+++ b/Documentation/technical/api-string-list.txt
@@ -104,8 +104,12 @@ write `string_list_insert(...)->util = ...;`.
`unsorted_string_list_has_string`::
It's like `string_list_has_string()` but for unsorted lists.
+
+`unsorted_string_list_lookup`::
+
+ It's like `string_list_lookup()` but for unsorted lists.
+
-This function needs to look through all items, as opposed to its
+The above two functions need to look through all items, as opposed to their
counterpart for sorted lists, which performs a binary search.
Data structures