Merge branch 'master' into milestones/2.0.0

bin/sequelize

@@ -166,7 +166,7 @@ if(typeof program.env === 'string') {
   configuration.environment = program.env
   configuration.environment = program.env
 }
 }
 
 
-if (program.migrate) {
+if (program.migrate || program.undo) {
   if (configFileExists() || program.url) {
   if (configFileExists() || program.url) {
     var config
     var config
       , options  = {}
       , options  = {}

changelog.md

@@ -7,6 +7,7 @@ Notice: All 1.7.x changed are present in 2.0.x aswell
 - instance.createAssociationInstance functionality added [#1213](https://github.com/sequelize/sequelize/pull/1213)
 - instance.createAssociationInstance functionality added [#1213](https://github.com/sequelize/sequelize/pull/1213)
 - fixes a few bugs with transactions in regards to associations
 - fixes a few bugs with transactions in regards to associations
 - add error handling for transaction creation
 - add error handling for transaction creation
+- `sequelize --undo` will now actually undo migrations. Its basically an alias for `sequelize --migrate --undo`. [#1059](https://github.com/sequelize/sequelize/pull/1059)
 
 
 #### Backwards compatability changes
 #### Backwards compatability changes
 - Hooks are no longer passing value hashes. Instead, they are now passing instances of the model.
 - Hooks are no longer passing value hashes. Instead, they are now passing instances of the model.

test/sequelize.executable.test.js

@@ -305,7 +305,7 @@ describe(Support.getTestDialectTeaser("Executable"), function() {
         })
         })
       })
       })
     })
     })
-  })(['--migrate --undo', '-mu'])
+  })(['--migrate --undo', '-mu', '--undo', '-u'])
 
 
   ;(function(flags) {
   ;(function(flags) {
     flags.forEach(function(flag) {
     flags.forEach(function(flag) {