summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2010-05-10merge: --log appends shortlog to message if specifiedLibravatar Tay Ray Chuan1-7/+11
2010-05-10merge: rename variableLibravatar Tay Ray Chuan1-3/+3
2010-05-10merge: update commentLibravatar Tay Ray Chuan1-1/+1
2010-05-08Merge branch 'cc/revert-strategy'Libravatar Junio C Hamano1-36/+45
2010-04-01merge: make function try_merge_command non staticLibravatar Christian Couder1-2/+2
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Libravatar Christian Couder1-36/+45
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+1292