Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2011-10-21 | Merge failures into non-master branches are ok (conflicts) | Boris Kolpackov | 1 | -1/+8 |
2011-08-30 | Only allow fast-forward merges into master | Boris Kolpackov | 1 | -1/+17 |
2011-04-28 | Treat etc as other modules | Boris Kolpackov | 1 | -1/+1 |
2011-04-04 | Add merge.sh script1.3.0 | Boris Kolpackov | 1 | -0/+20 |