summaryrefslogtreecommitdiff
path: root/git/merge.sh
AgeCommit message (Expand)AuthorFilesLines
2011-10-21Merge failures into non-master branches are ok (conflicts)Boris Kolpackov1-1/+8
2011-08-30Only allow fast-forward merges into masterBoris Kolpackov1-1/+17
2011-04-28Treat etc as other modulesBoris Kolpackov1-1/+1
2011-04-04Add merge.sh script1.3.0Boris Kolpackov1-0/+20