summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-081-36/+45
|\
| * merge: make function try_merge_command non staticChristian Couder2010-04-011-2/+2
| * merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-011-36/+45
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-1/+1
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+1292