summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Eric Wong <e@80x24.org>2019-10-06 23:30:34 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 10:20:10 +0900
commit6bcbdfb277bdc81b5ad6996b3fb005382a35c2ee (patch)
treed2c5a170735b75f905cfe0314aec1d6431e6142a /Documentation/git-merge-one-file.txt
parentintroduce container_of macro (diff)
downloadtgif-6bcbdfb277bdc81b5ad6996b3fb005382a35c2ee.tar.xz
hashmap_get_next returns "struct hashmap_entry *"
This is a step towards removing the requirement for hashmap_entry being the first field of a struct. Signed-off-by: Eric Wong <e@80x24.org> Reviewed-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions