mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-05-07 23:40:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,368 Commits 131 Branches 878 Tags
e53744ded0101ea5923df95ddf111757c2fbfc96
Commit Graph

9 Commits

Author SHA1 Message Date
Chris Breiding f31586d4b9 make import/merge more flexible 2017-05-15 13:59:41 -04:00
Chris Breidng da2e04fc94 Merge branch 'master' into CYP-94-cli-rewrite 
# Conflicts:
#	dev/run.js
 2017-04-21 10:58:19 -04:00
Chris Breidng e14345a947 inherit stdio for import/merge commands 2017-04-21 10:09:37 -04:00
Chris Breidng 0d20024ead allow specifying branch for repo merge 2017-04-21 10:08:26 -04:00
Chris Breidng f52291de7b update merge script to use git subtree pull 2017-04-20 17:24:11 -04:00
Chris Breiding aeadf4c9a3 convert run scripts to JS and prep for require-able cypress module 2017-03-15 09:56:06 -04:00
Chris Breiding bdeef6c686 some cleanup 2016-10-06 13:22:25 -04:00
Chris Breiding 2aacd4fc29 reference where git commands came from 2016-10-06 13:09:09 -04:00
Chris Breiding 2b63fc2fa5 add merge script for merging in changes from individual repo 2016-10-06 13:08:29 -04:00