c80fa3bd5f72e5f95bfd62d676cbd4693ae24379 Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/f382ea84bfa78fa7fde32858b6c2499978ed3070 f382ea84bfa78fa7fde32858b6c2499978ed3070 2008-09-12T09:16:20-07:00 2008-09-12T09:16:20-07:00 Merge branch 'master' of git@github.com:fabien/merb-thor Conflicts: merb.thor 19c0b963035e2063c9bad0bb352fc7d6e611628a Matt Aimonetti mattaimonetti@gmail.com da56f52c74407535e992bc20ab4b71acf01cd1cc Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/c80fa3bd5f72e5f95bfd62d676cbd4693ae24379 c80fa3bd5f72e5f95bfd62d676cbd4693ae24379 2008-09-11T17:37:56-07:00 2008-09-11T17:37:56-07:00 made some progress but merb:edge still fails 954b0421c6f14d479edc29dc7a6f2bb1527c8afe Matt Aimonetti mattaimonetti@gmail.com 9fd3240d529d2df4476a51757b402d3bf77f84a1 1c40e861c7a1171b7839ade601434d6b0172405e Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/da56f52c74407535e992bc20ab4b71acf01cd1cc da56f52c74407535e992bc20ab4b71acf01cd1cc 2008-09-11T16:03:48-07:00 2008-09-11T16:03:48-07:00 merged conflicts with new merb:source:refresh task 3ed226686fb37df85dcb65e753d4b36a430717d6 Matt Aimonetti mattaimonetti@gmail.com 02e3b274bd1b74307b5d2891a1ffad89808f1f7e Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/9fd3240d529d2df4476a51757b402d3bf77f84a1 9fd3240d529d2df4476a51757b402d3bf77f84a1 2008-09-11T15:58:51-07:00 2008-09-11T15:58:51-07:00 worked on merb:source:refresh 3ed226686fb37df85dcb65e753d4b36a430717d6 Matt Aimonetti mattaimonetti@gmail.com 3ffe17a1c3b18517de6a10dafaba1849756d6192 Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/1c40e861c7a1171b7839ade601434d6b0172405e 1c40e861c7a1171b7839ade601434d6b0172405e 2008-09-11T14:32:04-07:00 2008-09-11T14:32:04-07:00 Moved utility taks to bottom of -T list bac9244d92008c2398393a772723ffd1de293708 Fabien Franzen info@atelierfabien.be 68154dc7f51a567de2b944527e2f0fb8467bc390 Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/02e3b274bd1b74307b5d2891a1ffad89808f1f7e 02e3b274bd1b74307b5d2891a1ffad89808f1f7e 2008-09-11T14:32:03-07:00 2008-09-11T14:32:03-07:00 fixed the merge 8659c2eabb7ede0e80f24901e26a962596b6ca15 Matt Aimonetti mattaimonetti@gmail.com 419092740e10cb42d7c610f1a2447d3d50c5412c Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/3ffe17a1c3b18517de6a10dafaba1849756d6192 3ffe17a1c3b18517de6a10dafaba1849756d6192 2008-09-11T14:29:50-07:00 2008-09-11T14:29:50-07:00 Fixed clobbered update task aeda32c607175f40ed5dd3e189c5dc354369f4ac Fabien Franzen info@atelierfabien.be 68154dc7f51a567de2b944527e2f0fb8467bc390 Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/419092740e10cb42d7c610f1a2447d3d50c5412c 419092740e10cb42d7c610f1a2447d3d50c5412c 2008-09-11T14:26:47-07:00 2008-09-11T14:26:47-07:00 Added some task skeleton for merb:edge dba412cdde0ae087ca71d54b0857c960bcac569e Fabien Franzen info@atelierfabien.be 1352377788dad072aa1ebcc0e795e2580cde808f 8d336c416c062f5b329a937be737bd7d49e3cfe0 Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/68154dc7f51a567de2b944527e2f0fb8467bc390 68154dc7f51a567de2b944527e2f0fb8467bc390 2008-09-11T14:01:28-07:00 2008-09-11T14:01:28-07:00 Resolved merge conflict 3cf5e8da893a0e85b41ea780896c0708ff2cce4a Fabien Franzen info@atelierfabien.be a1154e25d6f4ddf77d7c26ec5273a198ea5b88ad Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/1352377788dad072aa1ebcc0e795e2580cde808f 1352377788dad072aa1ebcc0e795e2580cde808f 2008-09-11T13:55:22-07:00 2008-09-11T13:55:22-07:00 Reworked Gem tasks 19873d081a33f419bbc5166a3901d1f14b41d8a8 Fabien Franzen info@atelierfabien.be 4cf990da336473d8e1ea6c14c0e0b6124402b09c Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/8d336c416c062f5b329a937be737bd7d49e3cfe0 8d336c416c062f5b329a937be737bd7d49e3cfe0 2008-09-11T13:45:22-07:00 2008-09-11T13:45:22-07:00 added merb:sources:update repo_url f0afea65462b8e0e2aaf35dca5260d0312d7c799 Matt Aimonetti mattaimonetti@gmail.com a1154e25d6f4ddf77d7c26ec5273a198ea5b88ad Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-thor/commit/4cf990da336473d8e1ea6c14c0e0b6124402b09c 4cf990da336473d8e1ea6c14c0e0b6124402b09c 2008-09-11T13:25:41-07:00 2008-09-11T13:25:41-07:00 added the clone task with support for multiple forks dc8396436a2b8dfa60387f8d57f5f4eba38578f0 Matt Aimonetti mattaimonetti@gmail.com 0f7411d68609b843c08b00aaaddf8bb78385f70f Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/a1154e25d6f4ddf77d7c26ec5273a198ea5b88ad a1154e25d6f4ddf77d7c26ec5273a198ea5b88ad 2008-09-11T09:54:34-07:00 2008-09-11T09:54:34-07:00 Tiny touchups e02c136f25f632ad666a894fa3a9b950edca25c3 Fabien Franzen info@atelierfabien.be Fabien Franzen info@atelierfabien.be http://github.com/mattetti/merb-thor/commit/0f7411d68609b843c08b00aaaddf8bb78385f70f 0f7411d68609b843c08b00aaaddf8bb78385f70f 2008-09-11T09:37:39-07:00 2008-09-11T09:37:39-07:00 Initial commit 2e055ca321877b18a85f285dce108c48aa4ff13c Fabien Franzen info@atelierfabien.be