summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-7/+11
* merge: rename variableTay Ray Chuan2010-05-101-3/+3
* merge: update commentTay Ray Chuan2010-05-101-1/+1
* Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+1292