diff --git a/src/gen/zsh.rs b/src/gen/zsh.rs
index df6e76f..56b9b3c 100644
--- a/src/gen/zsh.rs
+++ b/src/gen/zsh.rs
@@ -102,8 +102,8 @@ fn generate_fn(
 
   if !cmd_info.subcommands.is_empty() {
     out.push_str(&format!("{INDENT}case $line[{}] in\n", pos + 1));
-    for _sub_cmd in cmd_info.subcommands.keys() {
-      todo!()
+    for sub_cmd in cmd_info.subcommands.keys() {
+      out.push_str(&format!("{INDENT}{INDENT}{sub_cmd}) {sub_cmd};;"))
     }
     out.push_str(&format!("{INDENT}esac\n"));
   }
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 1a7f750..7894704 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -7,7 +7,7 @@ use flate2::bufread::GzDecoder;
 use log::{debug, error, trace, warn};
 use regex::Regex;
 use std::{
-  collections::{HashMap, HashSet},
+  collections::{hash_map::Entry, HashMap, HashSet},
   fs::File,
   io::{BufReader, Read},
   path::{Path, PathBuf},
@@ -181,6 +181,26 @@ impl ManParseConfig {
   }
 }
 
+fn insert_cmd(
+  subcommands: &mut HashMap<String, CommandInfo>,
+  mut cmd_parts: Vec<String>,
+  mut args: Vec<Arg>,
+) {
+  let head = cmd_parts.remove(0);
+  let cmd = match subcommands.entry(head) {
+    Entry::Occupied(o) => o.into_mut(),
+    Entry::Vacant(v) => v.insert(CommandInfo {
+      args: Vec::new(),
+      subcommands: HashMap::new(),
+    }),
+  };
+  if cmd_parts.is_empty() {
+    cmd.args.append(&mut args);
+  } else {
+    insert_cmd(&mut cmd.subcommands, cmd_parts, args);
+  }
+}
+
 fn parse_all_manpages(manpages: Vec<(String, PathBuf)>) -> HashMap<String, CommandInfo> {
   let mut res = HashMap::new();
 
@@ -190,14 +210,10 @@ fn parse_all_manpages(manpages: Vec<(String, PathBuf)>) -> HashMap<String, Comma
       match parse_manpage_text(&cmd_name, &text) {
         Some(parsed) => {
           trace!("Parsing man page for {} at {}", cmd_name, manpage.display());
-          // todo merge subcommands later instead
-          res.insert(
-            cmd_name,
-            CommandInfo {
-              args: parsed,
-              subcommands: HashMap::new(),
-            },
-          );
+          match detect_subcommand(&cmd_name, &text) {
+            Some(cmd_parts) => insert_cmd(&mut res, cmd_parts, parsed),
+            None => insert_cmd(&mut res, vec![cmd_name], parsed),
+          }
         }
         None => {
           error!("Could not parse manpage for {}", cmd_name);
@@ -212,8 +228,6 @@ fn parse_all_manpages(manpages: Vec<(String, PathBuf)>) -> HashMap<String, Comma
     }
   }
 
-  // TODO merge subcommands
-
   res
 }
 
diff --git a/tests/resources/expected/_git.zsh b/tests/resources/expected/_git.zsh
deleted file mode 100644
index 3775cf5..0000000
--- a/tests/resources/expected/_git.zsh
+++ /dev/null
@@ -1,33 +0,0 @@
-#compdef _git git
-
-function _git {
-    _arguments -C \
-        '-v[Prints the Git suite version that the git program came from. .sp This option ...]' \
-        '--version[Prints the Git suite version that the git program came from. .sp This option ...]' \
-        '-h[Prints the synopsis and a list of the most commonly used commands. If the opt...]' \
-        '--help[Prints the synopsis and a list of the most commonly used commands. If the opt...]' \
-        '-C[Run as if git was started in <path> instead of the current working directory....]' \
-        '-c[Pass a configuration parameter to the command. The value given will override ...]' \
-        '--config-env[Like -c <name>=<value>, give configuration variable <name> a value, where <en...]' \
-        '--exec-path[Path to wherever your core Git programs are installed. This can also be contr...]' \
-        '--html-path[Print the path, without trailing slash, where Git'"'"'s HTML documentation is ins...]' \
-        '--man-path[Print the manpath (see man(1)) for the man pages for this version of Git and ...]' \
-        '--info-path[Print the path where the Info files documenting this version of Git are insta...]' \
-        '-p[Pipe all output into less (or if set, $PAGER) if standard output is a termina...]' \
-        '--paginate[Pipe all output into less (or if set, $PAGER) if standard output is a termina...]' \
-        '-P[Do not pipe Git output into a pager]' \
-        '--no-pager[Do not pipe Git output into a pager]' \
-        '--git-dir[Set the path to the repository (".git" directory). This can also be controlle...]' \
-        '--work-tree[Set the path to the working tree. It can be an absolute path or a path relati...]' \
-        '--namespace[Set the Git namespace. See gitnamespaces(7) for more details. Equivalent to s...]' \
-        '--bare[Treat the repository as a bare repository. If GIT_DIR environment is not set,...]' \
-        '--no-replace-objects[Do not use replacement refs to replace Git objects. See git-replace(1) for mo...]' \
-        '--literal-pathspecs[Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equi...]' \
-        '--glob-pathspecs[Add "glob" magic to all pathspec. This is equivalent to setting the GIT_GLOB_...]' \
-        '--noglob-pathspecs[Add "literal" magic to all pathspec. This is equivalent to setting the GIT_NO...]' \
-        '--icase-pathspecs[Add "icase" magic to all pathspec. This is equivalent to setting the GIT_ICAS...]' \
-        '--no-optional-locks[Do not perform optional operations that require locks. This is equivalent to ...]' \
-        '--list-cmds[List commands by group. This is an internal/experimental option and may chang...]' \
-        '--attr-source[Read gitattributes from <tree-ish> instead of the worktree. See gitattributes...]' \
-        '*::args->args'
-}