aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* unpack_trees: group error messages by typeMatthieu Moy2010-08-11
* merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-11
* Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-11
* Merge branch 'tc/merge-m-log'Junio C Hamano2010-06-18
|\
| * merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-10
| * merge: rename variableTay Ray Chuan2010-05-10
| * merge: update commentTay Ray Chuan2010-05-10
* | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-08
|\ \ | |/ |/|
| * merge: make function try_merge_command non staticChristian Couder2010-04-01
| * merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-01
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22