Merge branch 'nd/checkout-f-while-conflicted-fix'

diff --git a/Documentation/technical/api-oid-array.txt b/Documentation/technical/api-oid-array.txt
index 9febfb1d528b2764d6d603ea25eae0ac6b048f68..c97428c2c3495e3f575ed944027740e882128482 100644 (file)
--- a/Documentation/technical/api-oid-array.txt
+++ b/Documentation/technical/api-oid-array.txt
@@ -48,6 +48,11 @@ Functions
        is not sorted, this function has the side effect of sorting
        it.
 
+`oid_array_filter`::
+       Apply the callback function `want` to each entry in the array,
+       retaining only the entries for which the function returns true.
+       Preserve the order of the entries that are retained.
+
 Examples
 --------