diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 17:00:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 17:00:18 (GMT) |
| commit | 96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b (patch) | |
| tree | 2fdbf47d2d2cfa75a392bee07e0c6d22711441c6 /Documentation/technical | |
| parent | 98c4ab32f80d00d0254bfdcab8d934dcda6a7504 (diff) | |
| parent | f701aae0774f4517b46dd866812c269c78f1e198 (diff) | |
| download | git-96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b.zip git-96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b.tar.gz git-96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b.tar.bz2 | |
Merge branch 'en/merge-recursive-2'
* en/merge-recursive-2: (57 commits)
merge-recursive: Don't re-sort a list whose order we depend upon
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
merge-recursive: Avoid unnecessary file rewrites
t6022: Additional tests checking for unnecessary updates of files
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
t6022: Add testcase for spurious "refusing to lose untracked" messages
t3030: fix accidental success in symlink rename
merge-recursive: Fix working copy handling for rename/rename/add/add
merge-recursive: add handling for rename/rename/add-dest/add-dest
merge-recursive: Have conflict_rename_delete reuse modify/delete code
merge-recursive: Make modify/delete handling code reusable
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
merge-recursive: Create function for merging with branchname:file markers
merge-recursive: Record more data needed for merging with dual renames
merge-recursive: Defer rename/rename(2to1) handling until process_entry
merge-recursive: Small cleanups for conflict_rename_rename_1to2
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
merge-recursive: Introduce a merge_file convenience function
merge-recursive: Fix modify/delete resolution in the recursive case
...
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-string-list.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt index 3f575bd..ce24eb9 100644 --- a/Documentation/technical/api-string-list.txt +++ b/Documentation/technical/api-string-list.txt @@ -29,6 +29,9 @@ member (you need this if you add things later) and you should set the . Can sort an unsorted list using `sort_string_list`. +. Can remove individual items of an unsorted list using + `unsorted_string_list_delete_item`. + . Finally it should free the list using `string_list_clear`. Example: @@ -112,6 +115,13 @@ write `string_list_insert(...)->util = ...;`. The above two functions need to look through all items, as opposed to their counterpart for sorted lists, which performs a binary search. +`unsorted_string_list_delete_item`:: + + Remove an item from a string_list. The `string` pointer of the items + will be freed in case the `strdup_strings` member of the string_list + is set. The third parameter controls if the `util` pointer of the + items should be freed or not. + Data structures --------------- |