summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano2010-05-081-6/+6
* Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-081-42/+39
|\
| * whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-041-42/+39
* | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-081-5/+1
|\ \
| * | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-5/+1
| |/
* | 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