summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
AgeCommit message (Expand)AuthorFilesLines
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZLibravatar brian m. carlson1-1/+1
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsLibravatar René Scharfe1-1/+1
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+1
2015-10-05use sha1_to_hex_r() instead of strcpyLibravatar Jeff King1-2/+2
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfLibravatar Jeff King1-1/+1
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-2/+2
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-2/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+111