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