summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-091-0/+1
|\
| * hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-0/+1
* | builtins: mark unused prefix parametersJeff King2023-03-281-1/+1
|/
* cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
* cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-3/+3
* cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason2022-11-211-5/+5
* replace and remove run_command_v_opt()René Scharfe2022-10-301-1/+3
* merge-index: ensure full indexDerrick Stolee2021-04-141-0/+5
* cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
* Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-261-1/+1
* use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-301-1/+1
* cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-1/+1
* use sha1_to_hex_r() instead of strcpyJeff King2015-10-051-2/+2
* convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-251-1/+1
* standardize usage info string formatAlex Henrie2015-01-141-1/+1
* Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-2/+2
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-2/+2
* Fix sparse warningsStephen Boyd2011-03-221-2/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+111