Merge pull request #144 from thaJeztah/allow-some-flags-during-rollback

Allow --detach and --quiet flags when using --rollback
Upstream-commit: 30af87981d
Component: cli

components/cli/cli/command/service/update.go

@@ -131,7 +131,7 @@ func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, options *serv
 		// Rollback can't be combined with other flags.
 		otherFlagsPassed := false
 		flags.VisitAll(func(f *pflag.Flag) {
-			if f.Name == "rollback" {
+			if f.Name == "rollback" || f.Name == "detach" || f.Name == "quiet" {
 				return
 			}
 			if flags.Changed(f.Name) {