summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* 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