summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-5/+1
|\
| * Introduce remove_or_warn functionPeter Collingbourne2010-03-281-5/+1
* | Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-211-6/+6
* | Merge branch 'maint'Junio C Hamano2010-04-091-4/+1
|/
* Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-201-40/+145
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+3670