Merge branch 'master' of https://github.com/andres-montanez/Magallanes

Conflicts: Mage/Task/Factory.php
2026-09-04 08:28:57 +02:00 · 2014-06-12 16:18:14 -03:00
parent 4e01cc3517 a73c10faed
commit 66ea107229
16 changed files with 190 additions and 41 deletions
@@ -310,7 +310,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
    			    case 'targz':
    			    	$deployStrategy = 'deployment/strategy/tar-gz';
    			    	break;
-
+                            
+                            case 'git-rebase':
+    			    	$deployStrategy = 'deployment/strategy/git-rebase';
+    			    	break;
+                            
    			    case 'guess':
    			    default:
    			    	if ($this->getConfig()->release('enabled', false) == true) {