aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\
| * merge-recursive --renormalizeJonathan Nieder2010-08-06
* | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-03
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22