aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
Commit message (Expand)AuthorAge
* replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
* Fix sparse warningsStephen Boyd2011-03-22
* Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\
| * merge-recursive --patienceJustin Frankel2010-08-26
| * merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-26
* | 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