summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* unpack_trees: group error messages by typeMatthieu Moy2010-08-111-0/+1
* merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-1/+1
* Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-1/+1
* Merge branch 'tc/merge-m-log'Junio C Hamano2010-06-181-8/+12
|\
| * 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/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