Updated deploy commands

laktek · Feb 20, 2011 · a6e61bf · a6e61bf
1 parent aa2d069
commit a6e61bf
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/cli b/cli
@@ -348,8 +348,19 @@ class App
 		update_branches
 	end
 
-	# Deploy the Changes to the Version + Master
-	def deploy
+	# Deploy the Changes From Master to Version + Dev
+	def deploy-from-master
+		has_changes
+		version
+		merge(BRANCH_MASTER)
+		dev
+		merge(BRANCH_MASTER)
+		master
+		push
+	end
+
+	# Deploy the Changes From Dev to Version + Master
+	def deploy-from-dev
 		has_changes
 		version
 		merge(BRANCH_DEV)