diff --git a/src/git_flow/command/branch.py b/src/git_flow/command/branch.py
index e02a298..b6c8d06 100644
--- a/src/git_flow/command/branch.py
+++ b/src/git_flow/command/branch.py
@@ -33,6 +33,12 @@ class BranchCommand(Command):
             help=f"Listar ramas 'en progreso' (ramas que empiezan con '{WIP_BRANCH_PREFIX}')"
         )
 
+        parser.add_argument(
+            "--all",
+            action="store_true",
+            help=f"Listar ramas de todos los entornos"
+        )
+
         return parser
 
     def run(self, args: Namespace = Namespace()):
@@ -45,9 +51,12 @@ class BranchCommand(Command):
             self.show_branches(TRASH_BRANCH_PREFIX)
         elif args.wip:
             self.show_branches(WIP_BRANCH_PREFIX)
-        elif args.environment is None:
+        elif args.all:
             self.show_envs()
             self.show_all_branches()
+        elif args.environment is None:
+            self.show_envs()
+            self.show_env_branches(self.current_branch)
         elif args.environment in self.environments:
             self.show_envs()
             self.show_env_branches(args.environment)