capistrano/capistrano — pull request #1127 by mtwentyman (2014-09-04 17:43:20+00:00)
Title: Ensure capistrano CLI options override rake's

[rake's implementation](https://github.com/jimweirich/rake/blob/f374191fdeca537c57472bb2b469f4b5faa8ed7f/lib/rake/application.rb#L381) of `#sort_options` was ordering capistrano's version of --dry-run first, rake's second.

During [option parsing](https://github.com/capistrano/capistrano/blob/2a291169dffc672eaa3ca79eca13b60dd66b19a3/lib/capistrano/application.rb#L51), this meant rake's was added last, overwriting cap's.

Let me know if you need anything else. Thanks!