summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
AgeCommit message (Expand)Author
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King
2015-01-14standardize usage info string formatAlex Henrie
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2012-12-10Which merge_file() function do you mean?Junio C Hamano
2011-03-22Fix sparse warningsStephen Boyd
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds