path: root/builtin/merge.c
AgeCommit message (Expand)Author
2010-06-18Merge branch 'tc/merge-m-log'Junio C Hamano
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan
2010-05-10merge: rename variableTay Ray Chuan
2010-05-10merge: update commentTay Ray Chuan
2010-05-09Merge branch 'cc/revert-strategy'Junio C Hamano
2010-04-01merge: make function try_merge_command non staticChristian Couder
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Christian Couder
2010-03-29Merge branch 'cc/cherry-pick-ff'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds