Nikolai Weibull's latest version.

1 files changed, 5172 insertions, 3675 deletions

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 8e54f3d90..bf22a3c9f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -20,1434 +20,85 @@
 
 # TODO: There is still undocumented configurability in here.
 
-# TODO: All if (( words[(I)-option] )) should be turned into
-# if (( words[(I)-option] > 0 && words[(I)-option] < CURRENT )), as the user
-# may go back and want to add an option before -option and in that case should
-# be able to complete whatever may come before -option.
+# HIGH-LEVEL COMMANDS (PORCELAIN)
 
-# TODO: suggested zstyles:
-#
-# zstyle ':completion::*:git-{name-rev,add,rm}:*' ignore-line true
-
-_git() {
-local nul_arg abbrev_arg find_copies_harder_arg diff_l_arg pretty_arg exec_arg
-local author_conversion_file_arg long_author_conversion_file_arg verbose_arg
-local help_arg template_arg shared_arg thin_arg author_conversion_file_arg_spec
-local -a diff_args fetch_args merge_args force_ref_arg tags_fetch_arg
-local -a upload_pack_arg common_fetch_args common_apply_args
-local -a revision_arguments
-
-nul_arg='-z[use NUL termination on output]'
-abbrev_arg='--abbrev=-[set minimum SHA1 display-length]: :_guard "[[\:digit\:]]#" length'
-find_copies_harder_arg='--find-copies-harder[try harder to find copies]'
-diff_l_arg='-l-[limit number of rename/copy targets to run]: :_guard "[[\:digit\:]]#" number'
-
-diff_args=(
-  '--diff-filter=-[select certain kinds of files for diff]: :_guard "[ACDMRTUXB*]#" kinds'
-  $find_copies_harder_arg
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--name-only[show only names of changed files]'
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--name-status[show only names and status of changed files]'
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)'{-u,-p}'[generate diff in patch format]'
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--stat=-[generate a diffstat instead of a patch]:: :__git_guard_diff-stat-width' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--patch-with-stat[generate patch and prepend its diffstat]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--patch-with-raw[generate patch but also keep the default raw diff output]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--raw[generate the default raw diff output]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--numstat[generate a more machine-friendly diffstat]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--shortstat[generate a summary diffstat]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--summary[generate a condensed summary of extended header information]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--dirstat[generate a dirstat by amount of changes]' \
-  '(--name-only --name-status -u -p --stat --patch-with-stat --patch-with-raw --raw --numstat --shortstat --summary)--dirstat-by-file[generate a dirstat by number of files]' \
-  '-B-[break complete rewrite changes into pairs of given size]: :_guard "[[\:digit\:]]#" size'
-  '-C-[detect copies as well as renames with given scope]: :_guard "[[\:digit\:]]#" size'
-  $diff_l_arg
-  '-M-[detect renames with given scope]: :_guard "[[\:digit\:]]#" size'
-  '-O-[output patch in the order of glob-pattern lines in given file]:file:_files'
-  '-R[do a reverse diff]'
-  '-S-[look for differences that contain the given string]:string'
-  '--pickaxe-all[when -S finds a change, show all changes in that changeset]'
-  '--pickaxe-regex[treat argument of -S as regular expression]'
-  '--full-index[show full object name of pre- and post-image blob]'
-  '(--full-index)--binary[in addition to --full-index, output binary diffs for git-apply]'
-  '(        --no-color --color-words)--color[show colored diff]'
-  '(--color            --color-words)--no-color[turn off colored diff]'
-  '(--color --no-color              )--color-words[show colored-word diff]'
-  '--no-renames[turn off rename detection]'
-  '--check[warn if changes introduce trailing whitespace or space/tab indents]'
-  '(-a --text)'{-a,--text}'[treat all files as text]'
-  '(-b --ignore-space-change -w --ignore-all-space)'{-b,--ignore-space-change}'[ignore changes in amount of white space]'
-  '(-b --ignore-space-change -w --ignore-all-space)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
-  '(-1 --base)'{-1,--base}'[diff against stage 1]'
-  '(-2 --ours)'{-2,--ours}'[diff against stage 2]'
-  '(-3 --theirs)'{-3,--theirs}'[diff against stage 3]'
-  $abbrev_arg
-  $nul_arg
-  '--exit-code[report exit code 1 if differences, 0 otherwise]'
-  '--unified=[generate diffs with n lines of context]:n'
-  '--inter-hunk-context=[combine hunks closer than n lines]:n'
-  '--patience[generate diffs with patience algorithm]'
-  '(--exit-code)--quiet[disable all output]'
-  '--relative=:path:_files -/'
-)
-
-pretty_arg='--pretty=-[pretty print commit messages]::pretty print:((raw\:"the raw commits"
-                                                                     medium\:"most parts of the messages"
-                                                                     short\:"few headers and only subject of messages"
-                                                                     full\:"all parts of the commit messages"
-                                                                     fuller\:"like full and includes dates"
-                                                                     email\:"use email headers like From and Subject"
-                                                                     oneline\:"commit-ids and subject of messages"))'
-
-exec_arg='--exec=-[specify path to git-upload-pack on remote side]:remote path'
-
-fetch_args=(
-  '-c[fetch commit objects]'
-  '-t[fetch trees associated with commit objects]'
-  '-a[fetch all objects]'
-  '-v[show what is downloaded]'
-  '-w[write commit-id into the filename under "$GIT_DIR/refs/<filename>"]:filename'
-  '--recover[recover from a failed fetch]'
-)
-
-# TODO: Add descriptions to strategies (stupid is undocumented).
-merge_args=(
-  '(-n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
-  '--stat[show a diffstat at the end of the merge]'
-  '--no-commit[perform the merge but do not autocommit]'
-  '--squash[merge, but do not make a commit]'
-  '--log[fill in one-line descriptions of the commits being merged in the log message]'
-  '--no-log[do not list one-line descriptions of the commits being merged in the log message]'
-  '--no-ff[generate a merge commit even if the merge resolved as a fast-forward]'
-  '--ff[do not generate a merge commit if the merge resolved as a fast-forward]'
-  '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies'
-)
-
-force_ref_arg=('(-f --force)'{-f,--force}'[allow refs that are not ancestors to be updated]')
-
-tags_fetch_arg=(
-  '(--no-tags -t --tags)--no-tags[disable automatic tag following]'
-  '(--no-tags -t --tags)'{-t,--tags}'[fetch remote tags]'
-)
-
-author_conversion_file_arg_spec='[specify author-conversion file]:author-conversion file:_files'
-
-author_conversion_file_arg='-A'$author_conversion_file_arg_spec
-
-long_author_conversion_file_arg='--authors-file=-'$author_conversion_file_arg_spec
-
-verbose_arg='-v[produce verbose output]'
-
-help_arg='-h[display usage information]'
-
-upload_pack_arg=('(-u --upload-pack)'{-u,--upload-pack=-}'[specify path to git-upload-pack on remote side]:remote path')
-
-common_fetch_args=(
-  '(-a --append)'{-a,--append}'[append ref names and object names of fetched refs to "$GIT_DIR/FETCH_HEAD"]'
-  $upload_pack_arg
-  $force_ref_arg
-  $tags_fetch_arg
-  '(-k --keep)'{-k,--keep}'[keep downloaded pack]'
-  '(-u --update-head-ok)'{-u,--update-head-ok}'[allow updates of current branch head]'
-  '(-q --quiet)'{-q,--quiet}'[do not print any results to stdout]'
-  '(-v --verbose)'{-v,--verbose}'[output extra information]'
-  '--depth=[deepen the history of a shallow repository by the given number of commits]:depth'
-)
-
-common_apply_args=(
-  '--whitespace=-[detect a new or modified line that ends with trailing whitespaces]: :__git_apply_whitespace_strategies'
-  '-p-[remove N leading slashes from traditional diff paths]: :_guard  "[[\:digit\:]]#" number'
-  '-C-[ensure at least N lines of context match before and after each change]: :_guard  "[[\:digit\:]]#" number')
-
-template_arg='--template=-[directory to use as a template for the object database]:directory:_directories'
-
-shared_arg='--shared=-[share repository amongst several users]::permissions:__git_repository_permissions'
-
-thin_arg='--thin[minimize number of objects to be sent]'
-
-__git_zstyle_default () {
-  zstyle -t $1 $2
-  if (( $status == 2 )); then
-    zstyle $*
-  fi
-}
-
-# TODO: Either skip uninteresting commands or skip the description - the list
-# is just too long.
-# NOTE: I'm coming to the opinion that skipping the description is the right
-# thing to do…, but not 100% sure yet.
-(( $+functions[_git_commands] )) ||
-_git_commands () {
-  local -a base_commands
-  base_commands=(
-    'add:add paths to the index'
-    'apply:apply patch on a git index file and a work tree'
-    'bisect:find the change that introduced a bug'
-    'branch:create and show branches'
-    'checkout:checkout and switch to a branch'
-    'cherry-pick:cherry-pick the effect of an existing commit'
-    'clone:clone a repository into a new directory'
-    'commit:record changes to the repository'
-    'diff:show changes between commits, commit and working tree, etc.'
-    'fetch:download objects and a head from another repository'
-    'gc:cleanup unnecessary files and optimize the local repository'
-    'grep:print lines matching a pattern'
-    'help:display help information about git subcommands'
-    'init:create empty git object database'
-    'log:show commit logs'
-    'merge:grand unified merge driver'
-    'mv:move or rename file, directory, or symlink'
-    'prune:prune all unreachable objects from the object database'
-    'pull:fetch from and merge with a remote repository'
-    'push:update remote refs along with associated objects'
-    'rebase:rebase local commits to new upstream head'
-    'reset:reset current HEAD to the specified state'
-    'revert:revert existing commit'
-    'rm:remove files from the working tree and from the index'
-    'show-branch:show branches and their commits'
-    'stage:add file contents to the staging area'
-    'stash:stash away changes to the working tree'
-    'status:show working-tree'\''s status'
-    'submodule:initialize or update or inspect submodules'
-    'tag:create tag object signed with GPG'
-    'verify-tag:check GPG signature of a tag')
-
-  local -a additional_commands
-  additional_commands=(
-    'am:apply patches from a mailbox (cooler than applymbox)'
-    'annotate:annotate file lines with commit info'
-    'applymbox:apply patches from a mailbox'
-    'applypatch:apply one patch extracted from an e-mail'
-    'archive:create an archive of files from a named tree'
-    'blame:blame file lines on commits'
-    'cat-file:provide content or type information for repository objects'
-    'check-attr:display gitattributes information'
-    'check-ref-format:makes sure that a reference-name is well formed'
-    'checkout-index:copy files from the index to the working directory'
-    'cherry:find commits not merged upstream'
-    'clean:remove untracked files from the working tree'
-    'clone-pack:clone a repository into the current repository (transport)'
-    'commit-tree:create a new commit object'
-    'count-objects:count unpacked objects and display their disk consumption'
-    'describe:show the most recent tag that is reachable from a commit'
-    'diff-files:compare files in the working tree and the index'
-    'diff-index:compare content and mode of blobs between index and repository'
-    'diff-stages:compare two "merge states" in the index file'
-    'diff-tree:compare the content and mode of blobs found via two tree objects'
-    'fetch-pack:receive missing objects from another repository'
-    'imap-send:dump mailbox from stdin into imap folder'
-    'index-pack:build pack index file for an existing packed archive'
-    'local-fetch:duplicate another git repository on a local system'
-    'ls-remote:show references in a remote or local repository'
-    'ls-tree:display tree object in human-readable form'
-    'mailinfo:extract patch from a single e-mail message'
-    'mailsplit:split mbox file into a list of files'
-    'merge-base:find as good a common ancestor as possible for a merge'
-    'merge-file:run a three-way file merge'
-    'merge-index:run merge for files needing merging'
-    'merge-tree:show three-way merge without touching index'
-    'mktag:create tag object'
-    'mktree:build tree-object from ls-tree formatted text'
-    'name-rev:find symbolic names for given revisions'
-    'notes:add/inspect commit notes'
-    'pack-objects:create packed archive of objects'
-    'pack-redundant:find redundant pack files'
-    'pack-refs:pack heads and tags for efficient repository access'
-    'parse-remote:routines to help parsing $GIT_DIR/remotes/'
-    'peek-remote:list references on a remote repository using the upload-pack protocol'
-    'prune-packed:remove extra objects that are already in pack files'
-    'read-tree:read tree information into the directory index'
-    'reflog:manage reflog information'
-    'relink:hardlink common objects in local repositories'
-    'repack:pack unpacked objects in a repository'
-    'request-pull:generate summary of pending changes'
-    'rerere:reuse recorded resolve'
-    'rev-list:list commit object in reverse chronological order'
-    'shortlog:summarize git log output'
-    'show:show various types of objects'
-    'show-index:display contents of a pack idx file'
-    'show-ref:list references in a local repository'
-    'symbolic-ref:read and modify symbolic references'
-    'tar-tree:create tar archive of the files in the named tree'
-    'unpack-file:create temporary file with blob'\''s contents'
-    'unpack-objects:unpack objects out of packed archive'
-    'update-ref:update object name stored in a reference safely'
-    'update-server-info:update auxiliary information on a dumb server'
-    'var:display git logical variable'
-    'verify-pack:validate packed git archive files'
-    'whatchanged:show commit-logs and differences they introduce'
-    'write-tree:create tree from the current index')
-
-  local -a useful_commands
-  useful_commands=(
-    'format-patch:prepare patches for e-mail submission'
-    'ls-files:information about files in the index/working directory'
-    'instaweb:instantly browse your working repository in gitweb'
-    'remote:manage set of tracked repositories'
-    'send-email:send patch-e-mails out of "format-patch" output'
-    'update-index:modify index in some given way')
-
-  local -a interoperability_commands
-  interoperability_commands=(
-    'archimport:import an Arch repository into git'
-    'cvsexportcommit:export a commit to a CVS checkout'
-    'cvsimport:import a CVS "repository" into a git repository'
-    'svnimport:import SVN repository into git'
-    'quiltimport:apply a quilt patchset'
-    'svn:bidirectional operation between a single Subversion branch and git'
-    'annex:manage files without tracking content')
-
-  local -a ancillary_commands
-  ancillary_commands=(
-    'config:get and set repository or global options'
-    'convert-objects:convert old-style git repository'
-    'for-each-ref:output information on each ref'
-    'get-tar-commit-id:extract commit ID from an archive created using tar-tree'
-    'hash-object:compute object ID from a file'
-    'patch-id:compute unique ID for a patch'
-    'fsck:verify the connectivity and validity of the objects in the database'
-    'lost-found:recover lost references that luckily have not yet been pruned'
-    'mergetool:run merge conflict resolution tools to resolve merge conflicts')
-
-  local -a internal_commands
-  internal_commands=(
-    'daemon:start a really simple server for git repositories'
-    'fast-import:import information into git directly'
-    'fmt-merge-msg:produce merge commit message'
-    'http-fetch:download remote git repository via HTTP'
-    'http-push:push missing objects using HTTP/DAV'
-    'merge-one-file:standard helper-program to use with merge-index'
-    'receive-pack:command invoked by send-pack to receive what is pushed to it'
-    'rev-parse:pick out and massage parameters for other git commands'
-    'runstatus:a helper for git-status and git-commit'
-    'send-pack:push to remote repository, intelligently'
-    'shell:restricted login shell for GIT-only SSH access'
-    'ssh-fetch:pull from remote repository over an SSH connection'
-    'ssh-upload:"server-side" helper program used by ssh-fetch'
-    'stripspace:filter out empty lines'
-    'upload-archive:send archive back to git-archive'
-    'upload-pack:command invoked by clone-pack and fetch-pack')
-
-  local wanted_commands
-  zstyle -s ":completion:${curcontext}:" commands wanted_commands || wanted_commands="all -internal"
-  local -a user_commands
-  zstyle -a ":completion:${curcontext}:" user-commands user_commands || user_commands=()
-
-  local -aU unique_wanted_commands
-  unique_wanted_commands=($=wanted_commands)
-
-  integer index_of_all=$(( $unique_wanted_commands[(I)all] ))
-  if (( index_of_all > 0 )); then
-    unique_wanted_commands[index_of_all]=()
-    unique_wanted_commands+=(base additional useful interoperability ancillary internal)
-  fi
-
-  for (( i = 0; i < $#unique_wanted_commands; i++ )); do
-    if [[ $unique_wanted_commands[i] == (#bq)-(*) ]]; then
-      unique_wanted_commands[i]=()
-      unique_wanted_commands[(I)$match[1]]=()
-    fi
-  done
-
-  local -a commands
-  for wanted_command in $unique_wanted_commands; do
-    case $wanted_command in
-      (base)
-        commands+=($base_commands) ;;
-      (additional)
-        commands+=($additional_commands) ;;
-      (useful)
-        commands+=($useful_commands) ;;
-      (interoperability)
-        commands+=($interoperability_commands) ;;
-      (ancillary)
-        commands+=($ancillary_commands) ;;
-      (internal)
-        commands+=($internal_commands) ;;
-    esac
-  done
-  commands+=( $user_commands )
-
-  _describe -t commands 'git command' commands && ret=0
-}
-
-(( $+functions[__git_aliases] )) ||
-__git_aliases () {
-  declare -a aliases
-
-  # TODO: See __git_config_gettable_name for discussion on how to actually get
-  # out the names, skipping the values.
-  # TODO: Should check if the terminal is unicode capable.  If so, use ‘ and ’
-  # instead of '.
-  aliases=(${^${${(M)${(f)"$(_call_program aliases git config --list)"}:#alias.*}#alias.}/(#b)=(*)/:alias for \'$match[1]}\')
-  __git_command_successful || return 0
-
-  local expl
-
-  _describe -t aliases 'git alias' aliases
-}
-
-(( $+functions[__git_aliases_and_commands] )) ||
-__git_aliases_and_commands () {
-  _alternative \
-    'aliases: :__git_aliases' \
-    'commands: :_git_commands'
-}
-# NOTE: -c is undocumented.
-# TODO: Perhaps provide some sort of completion or guard for line range (-L).
-# NOTE: --score-debug is undocumented.
-# NOTE: --show-name is undocumented.
-# NOTE: --show-number is undocumented.
-(( $+functions[_git-annotate] )) ||
-_git-annotate () {
-  _arguments -S \
-    '-b[show blank SHA-1 for boundary commits]' \
-    '--root[do not treat root commits as boundaries]' \
-    '--show-stats[include additional statistics at the end of blame output]' \
-    '-c[undocumented]' \
-    '-l[show long rev]' \
-    '-t[show raw timestamp]' \
-    '-S[use revs from revs-file]:revs-file:_files' \
-    '-M-[detect moving lines in the file as well]:number of characters' \
-    '*-C-[detect copied lines from other files from same commit as well]:number of characters' \
-    '-L[annotate only the given line range]:line range' \
-    '--contents[annotate against the given file if no rev is specified]:file:_files' \
-    '--incremental[show results incrementally for machine processing]' \
-    '--score-debug[uncodumented]' \
-    '(-f --show-name)'{-f,--show-name}'[undocumented]' \
-    '(-n --show-number)'{-n,--show-number}'[undocumented]' \
-    '(-p --porcelain)'{-p,--porcelain}'[show results designed for machine processing]' \
-    '(-h --help)'{-h,--help}'[show help message]' \
-    ':file:__git_cached_files' \
-    '::revision:__git_revisions' && ret=0
-}
-
-(( $+functions[_git-apply] )) ||
-_git-apply () {
-  _arguments \
-    $nul_arg \
-    '--allow-binary-replacement[allow binary files to be patched]' \
-    '--apply[apply patches that would otherwise not be applied]' \
-    '--cached[apply patches without touching the working tree]' \
-    '--check[check if patches are applicable (turns off "apply")]' \
-    '--include=-[include files matching specified pattern]:pattern' \
-    '--exclude=-[skip files matching specified pattern]:pattern' \
-    '--inaccurate-eof[work around missing-new-line-at-EOF bugs]' \
-    '--index[make sure that the patch is applicable to the index]' \
-    '--index-info[output information about original version of a blob if available]' \
-    '--no-add[ignore additions made by the patch]' \
-    '--numstat[same as --stat but in decimal notation and complete pathnames (turns off "apply")]' \
-    '(-R --reverse)'{-R,--reverse}'[apply patches in reverse]' \
-    '--reject[apply as much as possible, and leave rejected hunks in .rej files]' \
-    '--stat[output diffstat for the input (turns off "apply")]' \
-    '--summary[output summary of git-diff extended headers (turns off "apply")]' \
-    '--unidiff-zero[disable unified-diff-context check]' \
-    '(-v --verbose)'{-v,--verbose}'[report progress to stderr]' \
-    $common_apply_args \
-    '*::patch:_files' && ret=0
-}
-
-# NOTE: Documentation mentions options that don’t exist anymore, for example,
-# --since, and shows -C twice!aa
-(( $+functions[_git-blame] )) ||
-_git-blame () {
-  _git-annotate
-}
-
-(( $+functions[_git-checkout-index] )) ||
-_git-checkout-index () {
-  _arguments -S \
-    $nul_arg \
-    '(-a --all :)'{-a,--all}'[check out all files in the index]' \
-    '(-f --force)'{-f,--force}'[force overwrite of existing files]' \
-    '(-n --no-create)'{-n,--no-create}'[do not checkout new files]' \
-    '--stage=-[check out files from named stage]:stage:(1 2 3 all)' \
-    '--stdin[read list of paths from the standard input]' \
-    '--temp[write the content to temporary files]' \
-    '--prefix=-[prefix to use when creating files]:directory:_directories' \
-    '(-q --quiet)'{-q,--quiet}'[do not complain about existing files or missing files]' \
-    '(-u --index)'{-u,--index}'[update stat information in index]' \
-    '*::file:__git_cached_files' && ret=0
-}
-
-(( $+functions[_git-commit-tree] )) ||
-_git-commit-tree () {
-  if (( CURRENT == 2 )); then
-    __git_trees && ret=0
-  elif [[ $words[CURRENT-1] == -p ]]; then
-    local expl
-    _description commits expl 'parent commit'
-    __git_objects $expl && ret=0
-  else
-    compadd - '-p'
-  fi
-}
-
-(( $+functions[_git-hash-object] )) ||
-_git-hash-object () {
-  _arguments -S \
-    '(:)--stdin[read object from standard input]' \
-    '-t[the type of object to create]:object type:((blob\:"a blob of data"
-                                                    commit\:"a tree with parent commits"
-                                                    tag\:"a symbolic name for another object"
-                                                    tree\:"a recursive tree of blobs"))' \
-    '-w[write the object to the object database]' \
-    '(--stdin):file:_files' && ret=0
-}
-
-(( $+functions[_git-help] )) ||
-_git-help () {
-  _arguments -S \
-    ':command:_git_commands' \
-    - '(all)' \
-    '(:)'{--all,-a}'[List all available commands]' \
-    - '(format)' \
-    {--man,-m}'[Display help in man page format]' \
-    {--info,-i}'[Display help in info format]' \
-    {--web,-w}'[Display help in web browser]' \
-    && ret=0
-}
-
-(( $+functions[_git-index-pack] )) ||
-_git-index-pack () {
-  local -a stdin_arguments
-
-  if (( words[(I)--stdin] )); then
-    stdin_arguments=(
-      '--fix-thin[record deltified objects, based on objects not included]'
-      '--keep=-[create .keep file]::reason:')
-  fi
-
-  _arguments \
-    '-v[report progress to stderr]' \
-    '-o[write generated pack index into specified file]:file:_files' \
-    '--stdin[read pack from stdin and instead write to specified file]' \
-    $stdin_arguments \
-    ':pack file:_files -g "*.pack"' && ret=0
-}
-
-(( $+functions[_git-init] )) ||
-_git-init () {
-  _arguments \
-    '(-q --quiet)'{-q,--quiet}'[do not print any results to stdout]' \
-    '--bare[create a bare repository]' \
-    $shared_arg \
-    $template_arg && ret=0
-}
-
-(( $+functions[_git-merge-file] )) ||
-_git-merge-file () {
-  integer n_labels=${#${(M)words[1,CURRENT-1]:#-L}}
-  local label_argument
-
-  if (( n_labels < 3 )) || [[ $words[CURRENT-1] == -L ]]; then
-    local -a ordinals
-
-    ordinals=(first second third)
-
-    label_argument="*-L[label to use for the $ordinals[n_labels+1] file]:label"
-  fi
-
-  _arguments \
-    $label_argument \
-    '(-p --stdout)'{-p,--stdout}'[send merged file to standard output instead of overwriting first file]' \
-    '(-q --quiet)'{-q,--quiet}'[do not warn about conflicts]' \
-    ':current file:_files' \
-    ':base file:_files' \
-    ':other file:_files' && ret=0
-}
-
-(( $+functions[_git-merge-index] )) ||
-_git-merge-index () {
-  if (( CURRENT > 2 )) && [[ $words[CURRENT-1] != -[oq] ]]; then
-    _arguments -S \
-      '(:)-a[run merge against all files in the index that need merging]' \
-      '*:index file:__git_cached_files' && ret=0
-  else
-    declare -a arguments
-
-    (( CURRENT == 2 )) && arguments+='-o[skip failed merges]'
-    (( CURRENT == 2 || CURRENT == 3 )) && arguments+='(-o)-q[do not complain about failed merges]'
-    (( 2 <= CURRENT && CURRENT <= 4 )) && arguments+='*:merge program:_files -g "*(*)"'
-
-    _arguments -S $arguments && ret=0
-  fi
-}
-
-# TODO: Shouldn’t we add a __git_branches type completion?
-(( $+functions[_git-merge-tree] )) ||
-_git-merge-tree () {
-  _arguments \
-    ':base-tree:__git_tree_ishs' \
-    ':branch 1:__git_tree_ishs' \
-    ':branch 2:__git_tree_ishs' && ret=0
-}
-
-(( $+functions[_git-mktag] )) ||
-_git-mktag () {
-  _message 'no arguments allowed; only accepts tags on standard input'
-}
-
-(( $+functions[_git-mktree] )) ||
-_git-mktree () {
-  _arguments \
-    '-z[read NUL-terminated ls-tree -z output]' && ret=0
-}
-
-(( $+functions[_git-pack-objects] )) ||
-_git-pack-objects () {
-  _arguments \
-    '(--revs)--all[include all refs as well as revisions already specified]' \
-    '--all-progress[force progress output, even during write-out phase]' \
-    '--delta-base-offset[use delta-base-offset packing]' \
-    '--depth=[maximum delta depth]:number' \
-    '--incremental[ignore objects that have already been packed]' \
-    '--no-reuse-delta[do not reuse existing deltas, but compute them from scratch]' \
-    '--non-empty[only create a package if it contains at least one object]' \
-    '--local[similar to --incremental, but only ignore unpacked non-local objects]' \
-    '--progress[force progress output]' \
-    '--revs[read revision arguments from standard input]' \
-    '(:)--stdout[write the pack to standard output]' \
-    '-q[do not report progress]' \
-    '(--revs)--unpacked[limit objects to pack to those not already packed]' \
-    '--window=[number of objects to use per delta compression]:number' \
-    '(--stdout):base-name:_files' && ret=0
-}
-
-(( $+functions[_git-prune-packed] )) ||
-_git-prune-packed () {
-  _arguments -S \
-    '-n[only list the objects that would be removed]' \
-    '-q[suppress progress output]' && ret=0
-}
-
-(( $+functions[_git-read-tree] )) ||
-_git-read-tree () {
-  local aggressive_arg
-
-  if (( words[(I)-m] )); then
-    aggressive_arg='--aggressive[try harder to resolve merge conflicts]'
-  fi
-
-  local -a ui_args
-
-  if (( words[(I)(-m|--reset|--prefix)] )); then
-    ui_args=(
-      '(   -i)-u[update the work tree after successful merge]'
-      '(-u   )-i[update only the index; ignore changes in work tree]')
-  fi
-
-  local exclude_per_directory_arg
-
-  if (( words[(I)-u] )); then
-    exclude_per_directory_arg='--exclude-per-directory=-[specify .gitignore file]:.gitignore file:_files'
-  fi
-
-  _arguments -A '-*' \
-    '(   --reset --prefix)-m[perform a merge, not just a read]' \
-    '(-m         --prefix)--reset[perform a merge, not just a read, ignoring unmerged entries]' \
-    '(-m --reset          2 3)--prefix=-[read the contents of specified tree-ish under specified directory]:prefix:_directories -r ""' \
-    $aggressive_arg \
-    $ui_args \
-    $exclude_per_directory_arg \
-    '--trivial[restrict three-way merge to only happen if no file-level merging is required]'  \
-    '--index-output=[write index in the named file instead of $GIT_INDEX_FILE]:file:_files' \
-    '1:first tree-ish to be read/merged:__git_tree_ishs' \
-    '2:second tree-ish to be read/merged:__git_tree_ishs' \
-    '3:third tree-ish to be read/merged:__git_tree_ishs' && ret=0
-}
-
-# TODO: Complete value regex somehow?
-(( $+functions[_git-config] )) ||
-_git-config () {
-  local name_arg
-
-  if (( words[(I)--get-regexp] )); then
-    name_arg=':name regex'
-  elif (( words[(I)--get(-all|)] )); then
-    name_arg=':name:__git_config_gettable_name'
-  else
-    name_arg=':name:__git_config_name'
-  fi
-
-  _arguments -A '--*' \
-    '(         --global)--system[use system-wide config file]' \
-    '(--system         )--global[use user-global config file]' \
-    '(      --bool)--int[setting is an integer]' \
-    '(--int       )--bool[setting is a boolean]' \
-    $name_arg \
-    ":value:__git_config_values $words[CURRENT-1]" \
-    '::value regex' \
-    - '(actions)' \
-    '(: -)--rename-section[rename the given section]:section:__git_config_section_names:new name'  \
-    '(: -)--remove-section[remove the given section]:section:__git_config_section_names' \
-    '(3 -)--add[add new value without altering any existing ones]' \
-    '(2 -)--unset[remove the first matching value of the key]' \
-    '(2 -)--unset-all[remove all matching values of the key]' \
-    '(2 -)--get[get the first matching value of the key]' \
-    '(2 -)--get-all[get all matching values of the key]' \
-    '(2 -)--get-regexp[like "--get-all", but interpret "name" as a regular expression]' \
-    '(-)--replace-all[replace all values of the given key]' \
-    '(: --int --bool)'{-l,--list}'[list all variables set in config file]' && ret=0
-}
-
-# NOTE: --track is undocumented.
-# TODO: --track, -t, --master, and -m should take remote branches, I guess.
-# NOTE: --master is undocumented.
-# NOTE: --fetch is undocumented.
-(( $+functions[_git-remote] )) ||
-_git-remote () {
-  local curcontext=$curcontext state line
-  declare -A opt_args
-
-  _arguments -C \
-    ':command:->command' \
-    '*::options:->options' && ret=0
-
-  case $state in
-    (command)
-      declare -a commands
-
-      commands=(
-        'add:add a new remote'
-        'show:show information about a given remote'
-        'prune:delete all stale tracking branches for a given remote'
-        'update:fetch updates for a set of remotes'
-        'rm:remove a remote from .git/config and all associated tracking branches'
-        'rename:rename a remote from .git/config and update all associated tracking branches')
-
-      _describe -t commands 'sub-command' commands && ret=0
-      ;;
-    (options)
-      case $line[1] in
-        (add)
-          _arguments \
-            '*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \
-            '(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \
-            '(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \
-            ':branch name:__git_remotes' \
-            ':url:_urls' && ret=0
-          ;;
-        (show)
-          _arguments \
-            '-n[do not contact the remote for a list of branches]' \
-            ':remote:__git_remotes' && ret=0
-          ;;
-        (prune)
-          _arguments \
-            '(--dry-run -n)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \
-            ':remote:__git_remotes' && ret=0
-          ;;
-        (update)
-          __git_remote-groups && ret=0
-          ;;
-        (rm)
-          __git_remotes && ret=0
-          ;;
-        (rename)
-          __git_remotes && ret=0
-          ;;
-      esac
-      ;;
-  esac
-}
-
-(( $+functions[_git-unpack-objects] )) ||
-_git-unpack-objects () {
-  _arguments \
-    '-n[only list the objects that would be unpacked]' \
-    '-q[run quietly]' \
-    '-r[try recovering objects from corrupt packs]' && ret=0
-}
-
-(( $+functions[_git-update-index] )) ||
-_git-update-index () {
-  local nul_arg
-
-  if (( words[(I)--stdin] )); then
-    nul_arg='-z[paths are separated with NUL instead of LF for --stdin]'
-  fi
-
-  _arguments -S \
-    $refreshables \
-    '--add[add files not already in the index]' \
-    '(         --force-remove)--remove[remove files that are in the index but are missing from the work tree]' \
-    '(--remove               )--force-remove[remove files from both work tree and the index]' \
-    '(-q --unmerged --ignore-missing)--refresh[refresh the index]' \
-    '-q[run quietly]' \
-    '--unmerged[if unmerged changes exists, ignore them instead of exiting]' \
-    '--ignore-missing[ignore missing files when refreshing the index]' \
-    '*--cacheinfo[insert information directly into the cache]: :_guard "[0-7]#" "octal file mode": :_guard "[[\:xdigit\:]]#" "object id":file:_files' \
-    '(: -)--index-info[read index information from stdin]' \
-    '--chmod=-[set the execute permissions on the updated files]:permission:((-x\:executable +x\:"not executable"))' \
-    '(                   --no-assume-unchanged)--assume-unchanged[set the "assume unchanged" bit for the given paths]' \
-    '(--assume-unchanged                      )--no-assume-unchanged[unset the "assume unchanged" bit for the given paths]' \
-    '(-)'{-g,--again}'[run git-update-index on differing index entries]' \
-    '(-)--unresolve[restore "unmerged" or "needs updating" state of files]' \
-    '--info-only[only insert files object-IDs into index]' \
-    '--replace[replace files already in the index if necessary]' \
-    '(: -)--stdin[read list of paths from standard input]' \
-    '--verbose[report what is being added and removed from the index]' \
-    $nul_arg \
-    '*::file:_files' && ret=0
-}
-
-(( $+functions[_git-write-tree] )) ||
-_git-write-tree () {
-  _arguments \
-    '--missing-ok[ignore objects in the index that are missing in the object database]' \
-    '--prefix=-[write tree representing given sub-directory]:sub-directory:_directories -r ""' && ret=0
-}
-
-# shouldn't complete objects after --batch{,-check}...
-(( $+functions[_git-cat-file] )) ||
-_git-cat-file () {
-  _arguments \
-    '(-t -s -e -p --batch-check         1)--batch[print the SHA1, type, size, and contents of each object provided on stdin]' \
-    '(-t -s -e -p               --batch 1)--batch-check[print the SHA1, type, and size of each object provided on stdin]' \
-    '(   -s -e -p --batch-check --batch 1)-t[show the type of the given object]' \
-    '(-t    -e -p --batch-check --batch 1)-s[show the size of the given object]' \
-    '(-t -s    -p --batch-check --batch 1)-e[exit with zero status if object exists]' \
-    '(-t -s -e    --batch-check --batch 1)-p[pretty-print the given object]' \
-    '(-t -s -e -p --batch-check --batch  ):object type:(blob commit tag tree)' \
-    '(-t -s -e -p --batch-check --batch  ):object:__git_objects' && ret=0
-}
-
-(( $+functions[_git-describe] )) ||
-_git-describe () {
-  _arguments \
-    '--all[use any ref found in "$GIT_DIR/refs/"]' \
-    '--tags[use any ref found in "$GIT_DIR/refs/tags"]' \
-    '(--contains)--tags[use any tag found in "$GIT_DIR/refs/tags/"]' \
-    $abbrev_arg \
-    '--contains[find the tag after the commit instead of before]' \
-    '--exact-match[only output exact matches, same as --candidates=0]' \
-    '--always[show uniquely abbreviated commit object as fallback]' \
-    '--long[always show full format, even for exact matches]' \
-    '--match=[only consider tags matching glob pattern]:pattern' \
-    '--candidates=-[consider up to given number of candidates]: :_guard "[[\:digit\:]]##" "number of candidates"' \
-    '--debug[display information about the searching strategy]' \
-    '*:committish:__git_committishs' && ret=0
-}
-
-# TODO: Use __git_modified_files instead?
-(( $+functions[_git-diff-index] )) ||
-_git-diff-index () {
-  _arguments -S \
-    $diff_args \
-    '--cached[do not consider the work tree at all]' \
-    '-m[flag non-checked-out files as up-to-date]' \
-    ':tree-ish:__git_tree_ishs' \
-    '*::index file:__git_cached_files' && ret=0
-}
-
-# TODO: Use __git_modified_files instead?
-(( $+functions[_git-diff-files] )) ||
-_git-diff-files () {
-  _arguments \
-    $diff_args \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]' \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-1,--base}'[diff against "base" version]' \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-2,--ours}'[diff against "our branch" version]' \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]' \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]' \
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index --exit-code *)--no-index[compare given files / directories]' \
-    '-q[remain silent even on nonexisting files]' \
-    '1:file:_files' \
-    '2:file:_files' \
-    '*::file:_files' && ret=0
-}
-
-# TODO: Use __git_modified_files instead?
-(( $+functions[_git-diff-stages] )) ||
-_git-diff-stages () {
-  _arguments \
-    $diff_args \
-    ':stage 1:__git_stages' \
-    ':stage 2:__git_stages' \
-    '*::index file:_files' && ret=0
-}
-
-# TODO: Use __git_modified_files instead?
-(( $+functions[_git-diff-tree] )) ||
-_git-diff-tree () {
-  local curcontext=$curcontext state line
-  declare -A opt_args
-
-  _arguments -C -S \
-    $diff_args \
-    $pretty_arg \
-    '--encoding=-[re-code commit log-message in given encoding]::log-message encoding:__git_encodings' \
-    '--no-commit-id[skip output of commit IDs]' \
-    '--root[show diff against the empty tree]' \
-    '--stdin[read commit and tree information from standard input]' \
-    '-m[show merge commits]' \
-    '-r[recurse into subdirectories]' \
-    '(-r)-t[show tree entry itself as well as subtrees (implies -r)]' \
-    '-s[do not show differences]' \
-    '-v[show commit message before the differences]' \
-    '(-c --cc)-c[show differences from each of the parents to the merge result]' \
-    '(-c --cc)--cc[how differences from each of the parents and omit differences from only one parent]' \
-    '--always[always show commit itself and the commit log message]' \
-    ':tree-ish:__git_tree_ishs' \
-    '*::file:->files' && ret=0
-
-  case $state in
-    files)
-      if (( $#line > 2 )); then
-        # TODO: this is probably just stupid to do.
-        # What'd be nice would be
-        # common files:
-        #   ...
-        # original tree:
-        #   ...
-        # new tree:
-        #   ...
-        _alternative \
-          "original tree:original tree:__git_tree_files . $line[1]" \
-          "new tree:new tree:__git_tree_files . $line[2]" && ret=0
-      else
-        _alternative \
-          ': :__git_tree_ishs' \
-          ": :__git_tree_files . $line[1]" && ret=0
-      fi
-      ;;
-  esac
-}
-
-# TODO: Better completion for --format: should complete %(field) stuff, that
-# is, %(refname), %(objecttype), %(objectsize), %(objectname) with optional ‘*’
-# in front.
-# TODO: Documentation says that --count can be given * number of times, but
-# sources beg to differ, allowing only one.
-(( $+functions[_git-for-each-ref] )) ||
-_git-for-each-ref () {
-  _arguments -S \
-    '--format=-[output format of ref information]:format' \
-    '(-s --shell -p --perl --python --tcl)'{-s,--shell}'[use string literals suitable for sh]' \
-    '(-s --shell -p --perl --python --tcl)'{-p,--perl}'[use string literals suitable for Perl]' \
-    '(-s --shell -p --perl          --tcl)'--python'[use string literals suitable for Python]' \
-    '(-s --shell -p --perl --python      )'--tcl'[use string literals suitable for Tcl]' \
-    '--count=-[maximum number of refs to iterate over]: :_guard "[[\:digit\:]]#" "maximum number of refs"' \
-    '--sort=-[key to sort refs by]:sort key:__git_ref_sort_keys' \
-    ':: :_guard "([^-]?#|)" pattern' && ret=0
-}
-
-(( $+functions[_git-fmt-merge-msg] )) ||
-_git-fmt-merge-msg () {
-  arguments \
-    '(          --no-summary)--summary[add one-line descriptions from commits being merged]' \
-    '(--summary             )--no-summary[do not add one-line descriptions from commits being merged]' \
-    '(-F --file)'{-F,--file}'[specify list of merged objects from file]:file:_files' && ret=0
-}
-
-(( $+functions[_git-fsck] )) ||
-_git-fsck () {
-  _arguments \
-    '--cache[consider objects recorded in the index as head nodes for reachability traces]' \
-    '--full[check all object directories]' \
-    '--root[show root nodes]' \
-    '--strict[do strict checking]' \
-    '--tags[show tags]' \
-    '--unreachable[show objects that are unreferenced in the object database]' \
-    '*::object:__git_objects' && ret=0
-}
-
-(( $+functions[_git-ls-files] )) ||
-_git-ls-files () {
-  local no_empty_directory_arg
-
-  if (( words[(I)--directory] )); then
-    no_empty_directory_arg='--no-empty-directory[do not list empty directories]'
-  fi
-
-  _arguments -S \
-    $nul_arg \
-    '(-c --cached)'{-c,--cached}'[show cached files in the output]' \
-    '(-d --deleted)'{-d,--deleted}'[show deleted files in the output]' \
-    '(-i --ignored)'{-i,--ignored}'[show ignored files in the output]' \
-    '(-k --killed)'{-k,--killed}'[show killed files in the output]' \
-    '(-m --modified)'{-m,--modified}'[show modified files in the output]' \
-    '(-o --others)'{-o,--others}'[show other files in the output]' \
-    '(-s --stage)'{-s,--stage}'[show stage files in the output]' \
-    '(-u --unmerged)'{-u,--unmerged}'[show unmerged files in the output]' \
-    '(   -v)-t[identify each files status (HMRCK?)]' \
-    '(-t   )-v[identify each files status (hmrck?)]' \
-    '*'{-x,--exclude=-}'[skip files matching given pattern]:file pattern' \
-    '*'{-X,--exclude-from=-}'[skip files matching patterns in given file]:file:_files' \
-    '*--exclude-per-directory=-[skip directories matching patterns in given file]:file:_files' \
-    '--directory[if a whole directory is classified as "other", show just its name]' \
-    $no_empty_directory_arg \
-    '--error-unmatch[if any <file> does not appear in the index, treat this as an error]' \
-    '--full-name[force paths to be output relative to the project top directory]' \
-    $abbrev_arg \
-    '*::index file:_files' && ret=0
-}
-
-(( $+functions[_git-ls-tree] )) ||
-_git-ls-tree () {
-  local curcontext=$curcontext state line
-  declare -A opt_args
-
-  _arguments -C \
-    $nul_arg \
-    $abbrev_arg \
-    '(-t)-d[do not show children of given tree (implies -t)]' \
-    {--name-only,--name-status}'[list only filenames, one per line]' \
-    '-r[recurse into subdirectories]' \
-    '-t[show tree entries even when going to recurse them]' \
-    '--full-name[output full path-names]' \
-    ':tree-ish:__git_tree_ishs' \
-    '*::tree file:->files' && ret=0
-
-  case $state in
-    files)
-      __git_tree_files . $line[1] && ret=0
-      ;;
-  esac
-}
-
-(( $+functions[_git-imap-send] )) ||
-_git-imap-send () {
-  _message 'no arguments allowed; accepts mailbox file on standard input'
-}
-
-(( $+functions[_git-quiltimport] )) ||
-_git-quiltimport () {
-  _arguments \
-    '--dry-run[check patches and warn if they can'\''t be imported]' \
-    '--author[default author name and email address to use for patches]' \
-    '--patches[set directory containing patches]:patch directory:_directories' && ret=0
-}
-
-(( $+functions[_git-merge-base] )) ||
-_git-merge-base () {
-  _arguments \
-    '(-a --all)'{-a,--all}'[show all common ancestors]' \
-    ':commit 1:__git_commits' \
-    ':commit 2:__git_commits' && ret=0
-}
-
-(( $+functions[_git-name-rev] )) ||
-_git-name-rev () {
-  _arguments -S \
-    '--tags[only use tags to name the commits]' \
-    '--refs=-[only use refs matching given pattern]: :_guard "?#" "shell pattern"' \
-    '--always[show uniquely abbreviated commit object as fallback]' \
-    '--no-undefined[die with non-zero return when a reference is undefined]' \
-    '(--stdin :)--all[list all commits reachable from all refs]' \
-    '(--all :)--stdin[read from stdin and append revision-name]' \
-    '(--stdin --all)*:commit-ish:__git_revisions' && ret=0
-}
-
-(( $+functions[_git-notes] )) ||
-_git-notes () {
-  local expl
-  local -a notes_cmds
-
-  notes_cmds=(
-    edit:"edit note"
-    show:"show commit note"
-  )
-
-  if (( CURRENT == 2 )); then
-    _describe -t command "git-notes commands" notes_cmds && ret=0
-  else
-    case $words[2] in
-      (show)
-        _arguments \
-          '*:commit id:__git_commits' && ret=0
-        ;;
-      (edit)
-        _arguments \
-          '-F[use file'\''s contents as the commit note]:file:_path_files' \
-          '-m[use the given message as the commit note]:message' \
-          '*:commit id:__git_commits' && ret=0
-        ;;
-      (*)
-        _nothing
-        ;;
-    esac
-  fi
-}
-
-(( $+functions[_git-pack-redundant] )) ||
-_git-pack-redundant () {
-  _arguments \
-    '(:)--all[process all packs]' \
-    '--alt-odb[do not require objects to be present in local packs]' \
-    '--verbose[output some statistics to stderr]' \
-    '(--all)*::packs:_files -g "*.pack"' && ret=0
-}
-
-# TODO: --timestamp undocumented.
-(( $+functions[_git-rev-list] )) ||
-_git-rev-list () {
-  if (( words[(I)--] && words[(I)--] != CURRENT )); then
-    _arguments \
-      '*:index file:__git_cached_files' && ret=0
-  else
-    __git_setup_revision_arguments
-
-    _arguments -S \
-      $revision_arguments \
-      '(--pretty)--header[show commit headers]' \
-      '--remote-empty[stop when a given path disappears from the tree]' \
-      '--timestamp[undocumented]' \
-      '(         --bisect-vars)--bisect[show only the middlemost commit object]' \
-      '(--bisect              )--bisect-vars[same as --bisect, outputing shell-evalable code]' \
-      '--stdin[read commit objects from standard input]' \
-      '*:commit id:__git_commit_ranges2' && ret=0
-  fi
-}
-
-(( $+functions[_git-show-ref] )) ||
-_git-show-ref () {
-  _arguments -S \
-    - list \
-      '(-h --head)'{-h,--head}'[show the HEAD reference]' \
-      '--tags[show only "refs/tags"]' \
-      '--heads[show only "refs/heads"]' \
-      '(-d --dereference)'{-d,--dereference}'[dereference tags into object IDs as well]' \
-      '(-s --hash)'{-s+,--hash=-}'[only show the SHA-1 hash, not the reference name]:: :_guard "[[\:digit\:]]#" length' \
-      '--verify[enable stricter reference checking]' \
-      $abbrev_arg \
-      '(-q --quiet)'{-q,--quiet}'[do not print any results to stdout]' \
-      '*: :_guard "([^-]?#|)" pattern' \
-    - exclude \
-      '--exclude-existing=-[filter out existing refs from stdin]:: :_guard "([^-]?#|)" pattern' && ret=0
-}
-
-(( $+functions[_git-show] )) ||
-_git-show () {
-  local curcontext=$curcontext state line
-  typeset -A opt_args
-  __git_setup_revision_arguments
-
-  _arguments -S \
-    $revision_arguments \
-    '-s[do not show differences]' \
-    '*:object:__git_objects' && ret=0
-}
-
-(( $+functions[_git-show-index] )) ||
-_git-show-index () {
-  _message 'no arguments allowed; accepts index file on standard input'
-}
-
-(( $+functions[_git-tar-tree] )) ||
-_git-tar-tree () {
-  _arguments \
-    '--remote=-[retrieve a tar archive from a remote repository]:__git_remote_repository' \
-    ':tree-ish:__git_tree_ishs' \
-    ':base:_files' && ret=0
-}
-
-(( $+functions[_git-unpack-file] )) ||
-_git-unpack-file () {
-  _arguments \
-    ':blob id:__git_blobs' && ret=0
-}
-
-(( $+functions[_git-var] )) ||
-_git-var () {
-  _arguments \
-    '(:)-l[show logical variables]' \
-    '(-):variable:((GIT_AUTHOR_IDENT\:"name and email of the author" \
-                    GIT_COMMITTER_IDENT\:"name and email of committer"))' && ret=0
-}
-
-(( $+functions[_git-verify-pack] )) ||
-_git-verify-pack () {
-  _arguments -S \
-    '-v[show objects contained in pack]' \
-    '*:index file:_files -g "*.idx"' && ret=0
-}
-
-(( $+functions[_git-clone-pack] )) ||
-_git-clone-pack () {
-  _arguments \
-    $exec_arg \
-    ':repository:__git_any_repositories' \
-    '*:head:__git_heads' && ret=0
-}
-
-(( $+functions[_git-fetch-pack] )) ||
-_git-fetch-pack () {
-  _arguments \
-    '--all[fetch all remote refs]' \
-    '(-q --quiet)'{-q,--quiet}'[make output less verbose]' \
-    '(-k --keep)'{-k,--keep}'[do not invoke git-unpack-objects on received data]' \
-    $thin_arg \
-    '(--upload-pack --exec)'{--upload-pack=-,--exec=-}'[specify path to git-upload-pack on remote side]:remote path' \
-    '--depth=-[limit fetching to ancestor-chains not longer than given number]: :_guard "[[\:digit\:]]#" "maximum ancestor-chain length"' \
-    '--no-progress[do not show progress]' \
-    $verbose_arg \
-    ':repository:__git_any_repositories' \
-    '*:references:__git_references' && ret=0
-}
-
-(( $+functions[_git-fast-import] )) ||
-_git-fast-import () {
-  _arguments \
-    '--date-format=-[specify the types of dates being passed]:((raw\:"native git format"
-                                                                rfc2822\:"standard email format"
-                                                                now\:"use current time and timezone"))' \
-    '--max-pack-size=-[maximum size of each packfile]: :_guard "[[\:digit\:]]#" "maximum pack size"' \
-    '--depth=-[maximum delta depth for blob and tree deltification]: :_guard "[[\:digit\:]]#" "maximum delta depth"' \
-    '--active-branches=-[maximum number of branches to maintain active at once]: :_guard "[[\:digit\:]]#" "maximum number of branches"' \
-    '--export-marks=-[dump the internal marks table to given file]:export file:_files' \
-    '--export-pack-edges=-[list packfiles and last commit on branches in them in given file]:export file:_files' \
-    '--force[force updating modified existing branches]' \
-    '--quiet[disable all non-fatal output]' \
-    '--stats[display statistics about object created]' && ret=0
-}
-
-(( $+functions[_git-http-fetch] )) ||
-_git-http-fetch () {
-  _arguments \
-    $fetch_args \
-    '(1)--stdin[read commit ids and refs from standard input]' \
-    ':commit id:__git_commits' \
-    ':URL:_urls' && ret=0
-}
-
-(( $+functions[_git-http-push] )) ||
-_git-http-push () {
-  _arguments \
-    '--all[verify that all objects in local ref history exist remotely]' \
-    '--complete[do not assume that the remote repository is complete]' \
-    '--force[allow refs that are not ancestors to be updated]' \
-    '--verbose[report the list of objects being walked locally and sent to the remote]' \
-    '(   -D)-d[remove refs from remote repository]' \
-    '(-d   )-D[forcefully remove refs from remote repository]' \
-    ':URL:_urls' \
-    '*:remote refs:__git_remote_references' && ret=0
-}
-
-(( $+functions[_git-local-fetch] )) ||
-_git-local-fetch () {
-  _arguments \
-    $fetch_args \
-    '-l[hard-link objects]' \
-    '-n[do not copy objects]' \
-    '-s[sym-link objects]' \
-    '(1)--stdin[read commit ids and refs from standard input]' \
-    ':commit id:__git_commits' \
-    ':directory:_directories' && ret=0
-}
-
-# TODO: --tags undocumented.
-# TODO: --heads undocumented.
-# TODO: --refs undocumented.
-(( $+functions[_git-peek-remote] )) ||
-_git-peek-remote () {
-  _arguments \
-    '--upload-pack=-[specify path to git-upload-pack on remote side]:remote path' \
-    $exec_arg \
-    '--tags[undocumented]' \
-    '--heads[undocumented]' \
-    '--refs[undocumented]' \
-    ':repository:__git_repository' && ret=0
-}
-
-(( $+functions[_git-sh-setup] )) ||
-_git-sh-setup () {
-  _message "you probably should not be issuing this command; it is an internal git helper"
-}
-
-# TODO: --dry-run undocumented.
-# TODO: -n undocumented.
-# TODO: --stale-fix undocumented.
-# TODO: --verbose undocumented.
-# TODO: -- undocumented.
-(( $+functions[_git-reflog] )) ||
-_git-reflog () {
-  __git_setup_revision_arguments
-
-  if (( CURRENT == 2 )); then
-    local curcontext=$curcontext state line
-    declare -A opt_args
-
-    _arguments -C \
-      $revision_arguments \
-      ':subcommand:->subcommand' && ret=0
-
-    case $state in
-      (subcommand)
-        declare -a reflog_cmds
-
-        reflog_cmds=(
-        'expire:prune old reflog entries'
-        'show:show log of the current branch')
-
-        _describe -t subcommands 'subcommands' reflog_cmds && ret=0
-        ;;
-    esac
-  else
-    case $words[2] in
-      (expire)
-        _arguments -S \
-          '(-n --dry-run)'{-n,--dry-run}'[undocumented]' \
-          '--expire=-[prune entries older than given time]:date' \
-          '--expire-unreachable=-[prune entries older than given time and unreachable]:date' \
-          '--stale-fix[undocumented]' \
-          '--all[prune all refs]' \
-          '--verbose' && ret=0
-        ;;
-      (show|--*)
-        _arguments -S \
-          $revision_arguments \
-          ':subcommand:' && ret=0
-        ;;
-    esac
-  fi
-}
-
-(( $+functions[_git-receive-pack] )) ||
-_git-receive-pack () {
-  _arguments \
-    ':directory to sync into:_directories' && ret=0
-}
-
-(( $+functions[_git-shell] )) ||
-_git-shell () {
-  local curcontext=$curcontext state line
-  declare -A opt_args
-
-  _arguments -C \
-    '-c[command to execute]:command:->commands' \
-    ':argument to command:->arguments' && ret=0
-
-  case $state in
-    (commands)
-      declare -a commands
-
-      commands=(git-receive-pack git-upload-pack)
-
-      _describe -t commands command commands && ret=0
-      ;;
-    (arguments)
-      case $line[1] in
-        (git-receive-pack)
-          local expl
-
-          _description directories expl 'directory to sync into'
-          _directories $expl
-          ;;
-        (git-upload-pack)
-          local expl
-
-          _description directories expl 'directory to sync from'
-          _directories $expl
-          ;;
-      esac
-      ;;
-  esac
-}
-
-(( $+functions[_git-upload-archive] )) ||
-_git-upload-archive () {
-  _arguments \
-    ':directory to get tar archive from:_directories' && ret=0
-}
-
-(( $+functions[_git-send-pack] )) ||
-_git-send-pack () {
-  _arguments \
-    '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[specify path to git-receive-pack on remote side]:remote path' \
-    '--all[update all refs that exist locally]' \
-    '--force[update remote orphaned refs]' \
-    $verbose_arg \
-    $thin_arg \
-    ':repository:__git_any_repositories' \
-    '*:remote refs:__git_remote_references' && ret=0
-}
-
-(( $+functions[_git-ssh-fetch] )) ||
-_git-ssh-fetch () {
-  _arguments \
-    $fetch_args \
-    ':commit id:__git_commits' \
-    ':URL:_urls' && ret=0
-}
-
-(( $+functions[_git-ssh-upload] )) ||
-_git-ssh-upload () {
-  _arguments \
-    $fetch_args \
-    ':commit id:__git_commits' \
-    ':URL:_urls' && ret=0
-}
-
-(( $+functions[_git-update-server-info] )) ||
-_git-update-server-info () {
-  _arguments \
-    '(-f --force)'{-f,--force}'[update the info files from scratch]' && ret=0
-}
-
-(( $+functions[_git-upload-pack] )) ||
-_git-upload-pack () {
-  _arguments \
-    '--strict[do not try <directory>/.git/ if <directory> is not a git directory' \
-    '--timeout=-[interrupt transfer after given number of seconds of inactivity]: :_guard "[[\:digit\:]]" "inactivity timeout"' \
-    ':directory:_directories' && ret=0
-}
+# Main Porcelain Commands
 
 (( $+functions[_git-add] )) ||
 _git-add () {
   local curcontext=$curcontext state line
   declare -A opt_args
 
-  _arguments -C -S \
+  local ignore_missing=
+  if (( words[(I)-n|--dry-run] )); then
+    ignore_missing='--ignore-missing[check if files (even missing) are ignored in dry run]'
+  fi
+
+  _arguments -w -C -S -s \
     '(-n --dry-run)'{-n,--dry-run}'[do not actually add files; only show which ones would be added]' \
     '(-v --verbose)'{-v,--verbose}'[show files as they are added]' \
     '(-f --force)'{-f,--force}'[allow adding otherwise ignored files]' \
-    '(-i --interactive : -)'{-i,--interactive}'[add contents interactively to the index]' \
+    '(-i --interactive : -)'{-i,--interactive}'[add contents interactively to index]' \
     '(-p --patch)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \
+    '(-e --edit)'{-e,--edit}'[open diff against index in editor]' \
     '(-u --update -A --all)'{-u,--update}'[update only files git already knows about]' \
     '(-A --all -u --update)'{-A,--all}'[act as both add . and add -u]' \
-    '(-N --intent-to-add)'{-N,--intent-to-add}'[record only that the path will be added later]' \
-    '--refresh[do not add files, but refresh their stat() info in the index]' \
+    '(-N --intent-to-add)'{-N,--intent-to-add}'[record only that path will be added later]' \
+    '--refresh[do not add files, but refresh their stat() info in index]' \
     '--ignore-errors[continue adding if an error occurs]' \
-    '*:file:->files' && ret=0
+    $ignore_missing \
+    '*:: :->file' && ret=0
 
   case $state in
-    (files)
+    (file)
+      # TODO: Use __git_ignore_line_inside_arguments.
       declare -a ignored_files_alternatives
-      if (( words[(I)-f] )); then
+      if [[ -n ${line[(I)-f|--force]} ]]; then
         ignored_files_alternatives=(
           'ignored-modified-files:ignored modified files:__git_modified_files --ignored'
           'ignored-other-files:ignored other files:__git_other_files --ignored')
       fi
 
       _alternative \
-        'modified-files:modified files:__git_modified_files' \
-        'other-files:other files:__git_other_files' \
+        'modified-files::__git_modified_files' \
+        'other-files::__git_other_files' \
         $ignored_files_alternatives && ret=0
       ;;
   esac
 }
-__git_zstyle_default ':completion::complete:git-add:argument-rest:*' ignore-line yes
-
-(( $+functions[_git-stage] )) ||
-_git-stage () {
-  _git-add
-}
 
 (( $+functions[_git-am] )) ||
 _git-am () {
-  _arguments \
-    '--3way[use 3-way merge if patch does not apply cleanly]' \
-    '--abort[restore the original branch and abort the patching operation]' \
-    '--binary[pass "--allow-binary-replacement" to "git-apply"]' \
-    '--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \
-    '--interactive[apply patches interactively]' \
-    '--keep[pass "-k" flag to "git-mailinfo"]' \
-    '--resolved[continue after resolving patch failure by hand]' \
-    '--signoff[add "Signed-off-by:" line to the commit message]' \
+  local -a apply_options
+  __git_setup_apply_options
+
+  # NOTE: --resolvemsg is only for internal use between git rebase and git am.
+  # TODO: --patch-format is undocumented.
+  # TODO: --ignore-date is incorrectly documented as being passed to git
+  # mailsplit.
+  # TODO: --rebasing, --rerere-autoupdate, and --no-rerere-autoupdate are
+  # undocumented (and not implemented here).
+  _arguments -S \
+    '(-s --signoff)'{-s,--signoff}'[add Signed-off-by: line to the commit message]' \
+    '(-k --keep)'{-k,--keep}'[pass -k to git mailinfo]' \
+    '(          --no-keep-cr)--keep-cr[pass --keep-cr to git mailsplit]' \
+    '(--keep-cr             )--no-keep-cr[do not pass --keep-cr to git mailsplit]' \
+    '(-c --scissors --no-scissors)'{-c,--scissors}'[strip everything before a scissors line]' \
+    '(-c --scissors --no-scissors)--no-scissors[ignore scissors lines]' \
+    '(-q --quiet)'{-q,--quiet}'[only print error messages]' \
+    '(-u --utf8 --no-utf8)'{-u,--utf8}'[pass -u to git mailinfo]' \
+    '(-u --utf8 --no-utf8)--no-utf8[pass -n to git mailinfo]' \
+    '(-3 --3way)'{-3,--3way}'[use 3-way merge if patch does not apply cleanly]' \
+    $apply_options \
+    '(-i --interactive)'{-i,--interactive}'[apply patches interactively]' \
+    '--committer-date-is-author-date[use author date as committer date]' \
+    '--ignore-date[use committer date as author date]' \
     '--skip[skip the current patch]' \
-    '--utf8[pass "-u" flag to "git-mailinfo"]' \
-    '--no-utf8[do not pass "-u" flag to "git-mailinfo"]' \
-    $common_apply_args \
+    '(--continue -r --resolved)'{--continue,-r,--resolved}'[continue after resolving patch failure by hand]' \
+    '--abort[restore the original branch and abort the patching operation]' \
+    '--patch-format=-[specify format patches are in]:patch format:((mbox\:"mbox format"
+                                                                    stgit-series\:"StGit patch series"
+                                                                    stgit\:"stgit format"))' \
     '*:mbox file:_files' && ret=0
 }
 
@@ -1476,20 +127,22 @@ _git-archive () {
     esac
   fi
 
-  _arguments -C \
+  _arguments -w -C -S -s \
     '--format=-[format of the resulting archive]:archive format:__git_archive_formats' \
     '(- :)'{-l,--list}'[list available archive formats]' \
     '(-v --verbose)'{-v,--verbose}'[report progress to stderr]' \
     '--prefix=-[prepend the given path prefix to to each filename]:path prefix:_directories -r ""' \
+    '--output=[write archive to argument instead of stdout]:archive:_files' \
+    '--worktree-attributes[look for attributes in .gitattributes in working directory too]' \
     $backend_args \
-    '--remote=-[archive remote repository]:remote repository:__git_any_repositories' \
-    '--exec=-[path to git-receive-pack on remote]:remote path:_files' \
-    ':tree-ish:__git_tree_ishs' \
-    '*:tree file:->files' && ret=0
+    '--remote=[archive remote repository]:remote repository:__git_any_repositories' \
+    '--exec=[path to git-receive-pack on remote]:remote path:_files' \
+    ': :__git_tree_ishs' \
+    '*: :->file' && ret=0
 
   case $state in
-    (files)
-      __git_tree_files . $line[1] && ret=0
+    (file)
+      __git_tree_files ${PREFIX:-.} $line[1] && ret=0
       ;;
   esac
 }
@@ -1508,152 +161,264 @@ _git-applymbox () {
 
 (( $+functions[_git-bisect] )) ||
 _git-bisect () {
-  local bisect_cmds
-
-  bisect_cmds=(
-    bad:"mark current or given revision as bad"
-    good:"mark current or given revision as good"
-    log:"show the log of the current bisection"
-    next:"find next bisection to test and check it out"
-    replay:"replay a bisection log"
-    reset:"finish bisection search and return to the given branch (or master)"
-    start:"reset bisection state and start a new bisection"
-    visualize:"show the remaining revisions in gitk"
-    skip:"choose a nearby commit"
-    run:"run evaluation script"
-  )
+  # TODO: next subcommand is undocumented.  Git-bisect.sh mentions that the
+  # subcommand might be removed from the UI level.
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  if (( CURRENT == 2 )); then
-    _describe -t command "git-bisect commands" bisect_cmds && ret=0
-  else
-    case $words[2] in
-      (bad)
-        _arguments \
-          '2:revision:__git_commits' && ret=0
-        ;;
-      (good|skip)
-        _arguments \
-          '*:revision:__git_commits' && ret=0
-        ;;
-      (replay)
-        _arguments \
-          '2:file:_files' && ret=0
-        ;;
-      (reset)
-        _arguments \
-          '2:branch:__git_heads' && ret=0
-        ;;
-      (run)
-        _arguments \
-          '*::arguments: _normal' && ret=0
-        ;;
-      (start)
-        if (( words[(I)--] < CURRENT && words[(I)--] > 0 )); then
+  _arguments -C \
+    '--help[display git-bisect manual page]' \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
+
+  case $state in
+    (command)
+      declare -a commands
+
+      commands=(
+        help:'display a short usage description'
+        start:'reset bisection state and start a new bisection'
+        bad:'mark current or given revision as bad'
+        good:'mark current or given revision as good'
+        skip:'choose a nearby commit'
+        next:'find next bisection to test and check it out'
+        reset:'finish bisection search and return to the given branch (or master)'
+        visualize:'show the remaining revisions in gitk'
+        view:'show the remaining revisions in gitk'
+        replay:'replay a bisection log'
+        log:'show the log of the current bisection'
+        run:'run evaluation script')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (start)
+          _arguments -C \
+            ':bad revision:__git_commits' \
+            '*: :->revision-or-path' && ret=0
+          case $state in
+            (revision-or-path)
+              if compset -N '--' || ! __git_is_committish $line[CURRENT-1]; then
+                __git_cached_files && ret=0
+              else
+                _alternative \
+                  'revisions::__git_revisions' \
+                  'files::__git_cached_files' && ret=0
+              fi
+              ;;
+          esac
+          ;;
+        (bad)
           _arguments \
-            '*:paths:_files' && ret=0
-        else
+            ': :__git_commits' && ret=0
+          ;;
+        (good|skip)
+          # TODO: skip can take revlists.
           _arguments \
-            '2:bad revision:__git_commits' \
-            '*:good revision:__git_commits' && ret=0
-        fi
-        ;;
-
-      (*)
-        _nothing
-        ;;
-    esac
-  fi
+            '*: :__git_commits' && ret=0
+          ;;
+        (replay)
+          _arguments \
+            ':log file:_files' && ret=0
+          ;;
+        (reset)
+          _arguments \
+            ': :__git_heads' && ret=0
+          ;;
+        (run)
+          _arguments \
+            '*:: : _normal' && ret=0
+          ;;
+        (view|visualize)
+          local -a log_options revision_options
+          __git_setup_log_options
+          __git_setup_revision_options
+
+          _arguments -w -C -s \
+            $log_options \
+            $revision_options && ret=0
+        (*)
+          _nothing
+          ;;
+      esac
+      ;;
+  esac
 }
 
-# TODO: complete branch names?
 (( $+functions[_git-branch] )) ||
 _git-branch () {
+  declare l c m d
+
+  l='--color --no-color -r -a -v --verbose --abbrev --no-abbrev'
+  c='-l -f --force -t --track --no-track --set-upstream --contains --merged --no-merged'
+  m='-m -M'
+  d='-d -D'
+
+  declare -a dependent_creation_args
+  dependent_creation_args=(
+    "($l $m $d): :__git_branch_names"
+    "::start-point:__git_revisions")
+
   declare -a dependent_deletion_args
   if (( words[(I)-d] || words[(I)-D] )); then
+    dependent_creation_args=
     dependent_deletion_args=(
       '-r[delete remote-tracking branches]'
-      '*:branch-name:__git_branch_names')
+      '*: :__git_ignore_line_inside_arguments __git_branch_names')
   fi
 
   declare -a dependent_modification_args
   if (( words[(I)-m] || words[(I)-M] )); then
+    dependent_creation_args=
     dependent_modification_args=(
-      ':old or new branch-name:__git_branch_names'
-      '::new branch-name:__git_branch_names')
+      ':old or new branch name:__git_branch_names'
+      '::new branch name:__git_branch_names')
   fi
 
-  # TODO: I’m not happy with having to force a pattern with -A.
-  _arguments -S -A "-*" \
-    - list \
-      '(        --no-color)--color[turn on branch coloring]' \
-      '(--color           )--no-color[turn off branch coloring]' \
-      '(   -a)-r[list only the remote-tracking branches]' \
-      '(-r   )-a[list both remote-tracking branches and local branches]' \
-      '-v[show SHA1 and commit subject line for each head]' \
-      $abbrev_arg \
-      '--no-abbrev[do not abbreviate sha1s]' \
-    - create \
-      '-l[create the branch'\''s reflog]' \
-      '-f[force the creation of a new branch]' \
-      '--track[set up configuration so pull merges from the start point]' \
-      '--no-track[override the branch.autosetupmerge configuration variable]' \
-      '--contains=[only list branches which contain the specified commit]:commit:__git_committishs' \
-      '--merged[only list branches which are fully contained by HEAD]' \
-      '--no-merged[do not list branches which are fully contained by HEAD]' \
-      ':branch-name:__git_branch_names' \
-      '::start-point:__git_revisions' \
-    - modify \
-      '(   -M)-m[rename a branch and the corresponding reflog]' \
-      '(-m   )-M[rename a branch even if the new branch-name already exists]' \
-      $dependent_modification_args \
-    - delete \
-      '(   -D)-d[delete a fully merged branch]' \
-      '(-d   )-D[delete a branch]' \
-      $dependent_deletion_args && ret=0
-}
-__git_zstyle_default ':completion::complete:git-branch:delete-argument-rest:*' ignore-line yes
-
-# TODO: __git_tree_ishs is just stupid.  It should be giving us a list of tags
-# and perhaps also allow all that just with ^{tree} and so on.  Not quite sure
-# how to do that, though.
-(( $+functions[_git-checkout] )) ||
-_git-checkout () {
+  _arguments -w -S -s \
+    "($c $m $d --no-color :)--color=-[turn on branch coloring]:: :__git_color_whens" \
+    "($c $m $d : --color)--no-color[turn off branch coloring]" \
+    "($c $m $d : -a)-r[list only the remote-tracking branches]" \
+    "($c $m $d : -r)-a[list both remote-tracking branches and local branches]" \
+    "($c $m $d : -v --verbose)"{-v,--verbose}'[show SHA1 and commit subject line for each head]' \
+    "($c $m $d :)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length" \
+    "($c $m $d :)--no-abbrev[do not abbreviate sha1s]" \
+    "($l $m $d)-l[create the branch's reflog]" \
+    "($l $m $d -f --force)"{-f,--force}"[force the creation of a new branch]" \
+    "($l $m $d -t --track)"{-t,--track}"[set up configuration so that pull merges from the start point]" \
+    "($l $m $d)--no-track[override the branch.autosetupmerge configuration variable]" \
+    "($l $m $d)--set-upstream[set up configuration so that pull merges]" \
+    "($l $m $d)--contains=[only list branches which contain the specified commit]: :__git_committishs" \
+    "($l $m $d)--merged=[only list branches which are fully contained by HEAD]: :__git_committishs" \
+    "($l $m $d)--no-merged=[do not list branches which are fully contained by HEAD]: :__git_committishs" \
+    $dependent_creation_args \
+    "($l $c $d -M)-m[rename a branch and the corresponding reflog]" \
+    "($l $c $d -m)-M[rename a branch even if the new branch-name already exists]" \
+    $dependent_modification_args \
+    "($l $c $m -D)-d[delete a fully merged branch]" \
+    "($l $c $m -d)-D[delete a branch]" \
+    $dependent_deletion_args && ret=0
+}
+
+(( $+functions[_git-bundle] )) ||
+_git-bundle () {
   local curcontext=$curcontext state line
   declare -A opt_args
 
-  local new_branch_reflog_arg
+  _arguments -C \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
 
-  if (( words[(I)-b] > 0 )); then
-    new_branch_reflog_arg='-l[create the new branch'\''s reflog]'
-  fi
+  case $state in
+    (command)
+      declare -a commands
 
-  if compset -N '--'; then
-    __git_cached_files
-  else
-    _arguments -C -S \
-        '-q[suppress feedback messages]' \
-      - switch-branch \
-        '-f[force a complete re-read]' \
-        '-b[create a new branch based at given branch]: :__git_guard_branch-name' \
-        {-t,--track}'[set up configuration so pull merges from the start point]' \
-        '--no-track[override the branch.autosetupmerge configuration variable]' \
-        '-l[create the branch'\''s reflog]' \
-        $new_branch_reflog_arg \
-        '-m[3way merge current branch, working tree and new branch]' \
-        '::branch:__git_revisions' \
-      - update-files \
-        '::tree-ish:__git_tree_ishs' \
-        '*::file:->files' && ret=0
+      commands=(
+        'create:create a bundle'
+        'verify:check that a bundle is valid and will apply cleanly'
+        'list-heads:list references defined in bundle'
+        'unbundle:unbundle a bundle to repository')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (create)
+          if (( CURRENT == 2 )); then
+            _arguments \
+              ':bundle:_files' && ret=0
+          else
+            local revision_options
+            __git_setup_revision_options
+
+            _arguments -w -S -s \
+              $revision_options \
+              ': :_files' \
+              '*: :__git_commit_ranges2' && ret=0
+          fi
+          ;;
+        (verify)
+          _arguments \
+            ':bundle:_files' && ret=0
+          ;;
+        (list-heads|unbundle)
+          _arguments \
+            '*: :__git_ref_specs' && ret=0
+          ;;
+      esac
+      ;;
+  esac
+}
+
+(( $+functions[_git-checkout] )) ||
+_git-checkout () {
+  # TODO: __git_tree_ishs is just stupid.  It should be giving us a list of tags
+  # and perhaps also allow all that just with ^{tree} and so on.  Not quite sure
+  # how to do that, though.
+  local new_branch_reflog_opt
+  if (( words[(I)-b|-B] )); then
+    new_branch_reflog_opt="(--patch)-l[create the new branch's reflog]"
   fi
 
-  #XXX TODO and all that: $line[1] only works if you didn't write any options.
-  #What's the variable that holds the tree-ish argument? Is it even reliably possible?
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -s \
+    '(-q --quiet)'{-q,--quiet}'[suppress feedback messages]' \
+    '(-f --force -m --merge --conflict --patch)'{-f,--force}'[force branch switch/ignore unmerged entries]' \
+    '(-q --quiet        --theirs --patch)--ours[check out stage #2 for unmerged paths]' \
+    '(-q --quiet --ours          --patch)--theirs[check out stage #3 for unmerged paths]' \
+    '(   -B --orphan --ours --theirs --conflict --patch)-b[create a new branch based at given commit]: :__git_branch_names' \
+    '(-b    --orphan --ours --theirs --conflict --patch)-B[create or update branch based at given commit]: :__git_branch_names' \
+    '(-t --track --orphan --patch)'{-t,--track}'[set up configuration so pull merges from the base commit]' \
+    '(--patch)--no-track[override the branch.autosetupmerge configuration variable]' \
+    $new_branch_reflog_opt \
+    '(-b -B -t --track --patch)--orphan[create a new orphan branch based at given commit]: :__git_branch_names' \
+    '(-q --quiet -f --force -m --merge --conflict --patch)'{-m,--merge}'[3way merge current branch, working tree and new branch]' \
+    '(-q --quiet -f --force -m --merge --patch)--conflict[same as --merge, using given merge style]:style:(merge diff3)' \
+    '(-)'{-p,--patch}'[interactively select hunks in diff between given tree-ish and working tree]' \
+    '(-)--[start file arguments]' \
+    '*:: :->branch-or-tree-ish-or-file' && ret=0
+
   case $state in
-    (files)
-      if [[ -n $line[1] ]] && __git_is_treeish $line[1]; then
-        __git_tree_files . $line[1] && ret=0
+    (branch-or-tree-ish-or-file)
+      # TODO: Something about *:: brings us here when we complete at “-”.  I
+      # guess that this makes sense in a way, as we might want to treat it as
+      # an argument, but I can’t find anything in the documentation about this
+      # behavior.
+      [[ $line[CURRENT] = -* ]] && return
+      if (( CURRENT == 1 )) && [[ -z $opt_args[(I)--] ]]; then
+        # TODO: Allow A...B
+        local branch_arg='branches::__git_revisions' \
+              tree_ish_arg='tree-ishs::__git_tree_ishs' \
+              file_arg='files::__git_cached_files'
+
+        if [[ -n ${opt_args[(I)-b|-B|--orphan]} ]]; then
+          tree_ish_arg=
+          file_arg=
+        elif [[ -n $opt_args[(I)--track] ]]; then
+          branch_arg='remote-branches::__git_remote_branch_names'
+          tree_ish_arg=
+          file_arg=
+        elif [[ -n ${opt_args[(I)--ours|--theirs|-m|--conflict|--patch]} ]]; then
+          branch_arg=
+        fi
+
+        _alternative \
+          $branch_arg \
+          $tree_ish_arg \
+          $file_arg && ret=0
+      elif [[ -n ${opt_args[(I)-b|-B|-t|--track|--orphan]} ]]; then
+        _nothing && ret=0
+      elif [[ -n $line[1] ]] && __git_is_treeish $line[1]; then
+        __git_ignore_line __git_tree_files ${PREFIX:-.} $line[1] && ret=0
       else
-        __git_cached_files && ret=0
+        __git_ignore_line __git_cached_files && ret=0
       fi
       ;;
   esac
@@ -1662,127 +427,348 @@ _git-checkout () {
 (( $+functions[_git-cherry-pick] )) ||
 _git-cherry-pick () {
   _arguments \
-    '(-e --edit)'{-e,--edit}'[edit commit before committing the revert]' \
-    '(-n --no-commit)'{-n,--no-commit}'[do not make the actually commit]' \
-    '(-r --replay)'{-r,--replay}'[use original commit message intact]' \
+    '(-e --edit --ff)'{-e,--edit}'[edit commit before committing the revert]' \
+    '(--ff)-x[append information about what commit was cherry-picked]' \
     '(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \
-    '-x[append information about what commit was cherry-picked]' \
-    '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
-    ':commit:__git_revisions' && ret=0
+    '(-n --no-commit --ff)'{-n,--no-commit}'[do not make the actually commit]' \
+    '(-s --signoff --ff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
+    '(-e --edit -x -n --no-commit -s --signoff)--ff[fast forward, if possible]' \
+    ': :__git_revisions' && ret=0
+}
+
+(( $+functions[_git-citool] )) ||
+_git-citool () {
+  _nothing
 }
 
 (( $+functions[_git-clean] )) ||
 _git-clean () {
-  _arguments -S -s \
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -S -s \
     '-d[also remove untracked directories]' \
-    '-n[do a dry run]' \
-    '-f[required when clean.requireForce is true (default)]' \
-    '-q[run quietly]' \
+    '(-f --force)'{-f,--force}'[required when clean.requireForce is true (default)]' \
+    '(-n --dry-run)'{-n,--dry-run}'[only show what would and what would not be removed]' \
+    '(-q --quiet)'{-q,--quiet}'[only report errors]' \
+    '*'{-e,--exclude=}'[skip files matching specified pattern]:pattern' \
     '(-X   )-x[also remove ignored files]' \
     '(   -x)-X[remove only ignored files]' \
-    '*:file:_files' && ret=0
+    '*: :->file' && ret=0
+
+  case $state in
+    (file)
+      local exclusion ignored_other_files_alt other_files_alt
+      declare -a exclusions
+      for spec in $opt_args[-e] $opt_args[--exclude]; do
+        integer i
+        for (( i = 1; i <= $#spec; i++ )); do
+          case $spec[i] in
+            (\\)
+              if (( i + 1 <=  $#spec )) && [[ $spec[i+1] == : ]]; then
+                (( i++ ))
+                exclusion+=:
+              else
+                exclusion+=$spec[i]
+              fi
+              ;;
+            (:)
+              exclusions+=(-x $exclusion) exclusion=
+              ;;
+            (*)
+              exclusion+=$spec[i]
+              ;;
+          esac
+        done
+      done
+      [[ -n $exclusion ]] && exclusions+=(-x $exclusion)
+      if [[ -n ${opt_args[(I)-x|-X]} ]]; then
+        ignored_other_files_alt="ignored-untracked-files::__git_ignored_other_files $exclusions"
+      fi
+      if [[ -z ${opt_args[(I)-X]} ]]; then
+        other_files_alt="untracked-files::__git_other_files $exclusions"
+      fi
+      _alternative \
+        $ignored_other_files_alt \
+        $other_files_alt && ret=0
+      ;;
+  esac
 }
 
-# TODO: The --no-checkout is undocumented.
 (( $+functions[_git-clone] )) ||
 _git-clone () {
-  _arguments -S \
-    '--bare[make a bare GIT repository]' \
-    '--mirror[clone refs into refs/* instead of refs/remotes/origin/*]' \
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  # TODO: Argument to -o should be a remote name.
+  # TODO: Argument to -b should complete branch names in the repository being
+  # cloned.
+  _arguments -w -C -S -s \
     '(-l --local)'{-l,--local}'[clone locally, hardlink refs and objects if possible]' \
+    '--no-hardlinks[copy files instead of hardlinking when doing a local clone]' \
     '(-s --shared)'{-s,--shared}'[share the objects with the source repository (warning: see man page)]' \
     '--reference[reference repository]:repository:_directories' \
     '(-q --quiet)'{-q,--quiet}'[operate quietly]' \
     '(-v --verbose)'{-v,--verbose}'[always display the progressbar]' \
+    '--progress[output progress even if stderr is not a terminal]' \
     '(-n --no-checkout)'{-n,--no-checkout}'[do not checkout HEAD after clone is complete]' \
-    '(-o --origin)'{-o,--origin}'[use given name instead of "origin" as branch name]:name:__git_guard_branch-name' \
-    '--no-hardlinks[copy files instead of hardlinking when doing a local clone]' \
-    $upload_pack_arg \
-    $template_arg \
-    '--depth[create a shallow clone, given number of revisions deep]: :_guard "[[\:digit\:]]##" depth' \
-    ':repository:__git_any_repositories' \
-    ':directory:_directories' && ret=0
+    '(-o --origin)--bare[make a bare GIT repository]' \
+    '(--bare)--mirror[clone refs into refs/* instead of refs/remotes/origin/*]' \
+    '(-o --origin --bare)'{-o,--origin}'[use given remote name instead of "origin"]: :__git_guard_branch-name' \
+    '(-b --branch)'{-b,--branch}'[point HEAD to the given branch]: :__git_guard_branch-name' \
+    '(-u --upload-pack)'{-u,--upload-pack=}'[specify path to git-upload-pack on remote side]:remote path' \
+    '--template=[directory to use as a template for the object database]: :_directories' \
+    '--depth[create a shallow clone, given number of revisions deep]: :__git_guard_number depth' \
+    '--recursive[initialize all contained submodules]' \
+    ': :->repository' \
+    ': :_directories' && ret=0
+
+  case $state in
+    (repository)
+      if [[ -n ${opt_args[(I)-l|--local|--no-hardlinks|-s|--shared|--reference]} ]]; then
+        __git_local_repositories && ret=0
+      else
+        __git_any_repositories && ret=0
+      fi
+      ;;
+  esac
 }
 
 (( $+functions[_git-commit] )) ||
 _git-commit () {
-  _arguments -S \
+  local amend_opt='--amend[amend the tip of the current branch]'
+  if __git_is_initial_commit || __git_is_in_middle_of_merge; then
+    amend_opt=
+  fi
+
+  local reset_author_opt=
+  if (( words[(I)-C|--reuse-message(=*|)|-c|--reedit-message(=*|)|--amend] )); then
+    reset_author_opt='(--author)--reset-author[make committer the author of the commit]'
+  fi
+
+  # TODO: --null is an undocumented alias.
+  # TODO: --interactive isn’t explicitly listed in the documentation.
+  _arguments -w -S -s \
+    '(-a --all --interactive -o --only -i --include *)'{-a,--all}'[stage all modified and deleted paths]' \
+    $reset_author_opt \
+    '(        --porcelain --dry-run)--short[output dry run in short format]' \
+    '(--short             --dry-run)--porcelain[output dry run in porcelain-ready format]' \
+    '(--short --porcelain --dry-run -z --null)'{-z,--null}'[separate dry run entry output with NUL]' \
+    '(--reset-author)--author[override the author name used in the commit]:author name' \
+    '--date=[override the author date used in the commit]:date' \
+    '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
+    '(-n --no-verify)'{-n,--no-verify}'[do not look for suspicious lines the commit introduces]' \
     '--allow-empty[allow recording an empty commit]' \
-    '(-a --all --interactive)'{-a,--all}'[update all paths in the index file]' \
-    '(-a --all --interactive)--interactive[interactively update paths in the index file]' \
-    '--author[override the author name used in the commit]:author name' \
-    '--cleanup=-[specify how the commit message should be cleaned up]:mode:((verbatim\:"don'\''t change the commit message at all"
-                                                                             whitespace\:"remove leading and trailing whitespace lines"
-                                                                             strip\:"remove both whitespace and commentary lines"
-                                                                             default\:"act as '\''strip'\'' if the message is to be edited and as '\''whitespace'\'' otherwise"))' \
+    '--allow-empty-message[allow recording a commit with an empty message]' \
+    '--cleanup=[specify how the commit message should be cleaned up]:mode:((verbatim\:"don'\''t change the commit message at all"
+                                                                            whitespace\:"remove leading and trailing whitespace lines"
+                                                                            strip\:"remove both whitespace and commentary lines"
+                                                                            default\:"act as '\''strip'\'' if the message is to be edited and as '\''whitespace'\'' otherwise"))' \
     '(-e --edit)'{-e,--edit}'[edit the commit message before committing]' \
-    '(-o --only -i --include)'{-i,--include}'[update the given files and commit the whole index]' \
-    '(-o --only -i --include)'{-o,--only}'[commit only the given files]' \
-    '(-n --no-verify)'{-n,--no-verify}'[do not look for suspicious lines the commit introduces]' \
-    '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
-    '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress commit summary message]' \
+    '(-a --all --interactive -o --only -i --include)'{-i,--include}'[update the given files and commit the whole index]' \
+    '(-a --all --interactive -o --only -i --include)'{-o,--only}'[commit only the given files]' \
+    '(-u --untracked-files)'{-u-,--untracked-files=}'[show files in untracked directories]::mode:((no\:"show no untracked files"
+                                                                                                  normal\:"show untracked files and directories"
+                                                                                                  all\:"show individual files in untracked directories"))' \
     '(-q --quiet -v --verbose)'{-v,--verbose}'[show unified diff of all file changes]' \
-    '(-u --untracked-files)'{-u,--untracked-files}'[show files in untracked directories]' \
-    '*:file:__git_changed_files' \
+    '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress commit summary message]' \
+    '--dry-run[only show list of paths that are to be commited or not, and any untracked]' \
+    '(         --no-status)--status[include the output of git status in the commit message template]' \
+    '(--status            )--no-status[do not include the output of git status in the commit message template]' \
+    '(-a --all --interactive -o --only -i --include *)--interactive[interactively update paths in the index file]' \
+    '*: :__git_ignore_line_inside_arguments __git_changed_files' \
     - '(message)' \
-      '--amend[amend the tip of the current branch]' \
-      {-c,--reedit-message=}'[use existing commit object and edit log message]:commit:__git_commits' \
-      {-C,--reuse-message=}'[use existing commit object with same log message]:commit:__git_commits' \
-      {-F,--file=}'[read commit message from given file]:file:_files' \
-      {-m,--message=}'[use the given message as the commit message]:message' && ret=0
+      {-C,--reuse-message=}'[use existing commit object with same log message]: :__git_commits' \
+      {-c,--reedit-message=}'[use existing commit object and edit log message]: :__git_commits' \
+      {-F,--file=}'[read commit message from given file]: :_files' \
+      {-m,--message=}'[use the given message as the commit message]:message' \
+      {-t,--template=}'[use file as a template commit message]:template:_files' \
+      $amend_opt && ret=0
 }
-__git_zstyle_default ':completion::complete:git-commit:argument-rest:*' ignore-line yes
 
+(( $+functions[_git-describe] )) ||
+_git-describe () {
+  _arguments -w -S -s \
+    '(*)--dirty=-[describe HEAD, adding mark if dirty]::mark'
+    '--all[use any ref found in "$GIT_DIR/refs/"]' \
+    '--tags[use any ref found in "$GIT_DIR/refs/tags"]' \
+    '(--tags)--contains[find the tag after the commit instead of before]' \
+    '(--long)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+    '(             --exact-match)--candidates=[consider up to given number of candidates]: :__git_guard_number "number of candidates"' \
+    '(--candidates              )--exact-match[only output exact matches, same as --candidates=0]' \
+    '--debug[display information about the searching strategy]' \
+    '(--abbrev)--long[always show full format, even for exact matches]' \
+    '--match=[only consider tags matching glob pattern]:pattern' \
+    '--always[show uniquely abbreviated commit object as fallback]' \
+    '*: :__git_committishs' && ret=0
+}
 
-# TODO: __git_files should be __git_tree_files (do like in git-diff-tree and
-# such)
 (( $+functions[_git-diff] )) ||
 _git-diff () {
-  _arguments -S \
-    $diff_args \
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  local -a diff_options
+  __git_setup_diff_options
+
+  _arguments -w -C -s \
+    $* \
+    $diff_options \
     '(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \
-    '::commit range:__git_commit_ranges' \
-    '::original revision:__git_objects' \
-    '::new revision:__git_objects' \
-    '*::index file:__git_files' && ret=0
+    '(-)--[start file arguments]' \
+    '*:: :->from-to-file' && ret=0
+
+  case $state in
+    (from-to-file)
+      case $CURRENT in
+        (1)
+          if [[ -n ${opt_args[(I)--]} ]]; then
+            __git_changed-in-working-tree_files && ret=0
+          else
+            local files_alt='files::__git_changed-in-working-tree_files'
+
+            if [[ -n ${opt_args[(I)--cached|--staged]} ]]; then
+              files_alt='files::__git_changed-in-index_files'
+            fi
+
+            _alternative \
+              'commit-ranges::__git_commit_ranges' \
+              'blobs-and-trees-in-treeish::__git_blobs_and_trees_in_treeish' \
+              $files_alt \
+              'blobs::__git_blobs ' && ret=0
+          fi
+          ;;
+        (2)
+          if __git_is_committish_range $line[1]; then
+            __git_tree_files ${PREFIX:-.} $(__git_committish_range_last $line[1]) && ret=0
+          elif __git_is_committish $line[1] || __git_is_treeish $line[1]; then
+            if [[ -n ${opt_args[(I)--]} ]]; then
+              __git_changed-in-working-tree_files && ret=0
+            else
+              _alternative \
+                'commits::__git_commits' \
+                'blobs-and-trees-in-treeish::__git_blobs_and_trees_in_treeish' \
+                'files::__git_changed-in-working-tree_files' && ret=0
+            fi
+          elif __git_is_blob $line[1]; then
+            if [[ -n ${opt_args[(I)--]} ]]; then
+              __git_cached_files && ret=0
+            else
+              _alternative \
+                'files::__git_cached_files' \
+                'blobs::__git_blobs' && ret=0
+            fi
+          elif [[ -n ${opt_args[(I)--cached|--staged]} ]]; then
+            __git_changed-in-index_files && ret=0
+          else
+            __git_changed-in-working-tree_files && ret=0
+          fi
+          ;;
+        (*)
+          if __git_is_committish_range $line[1]; then
+            __git_tree_files ${PREFIX:-.} $(__git_committish_range_last $line[1]) && ret=0
+          elif { __git_is_committish $line[1] && __git_is_committish $line[2] } ||
+              __git_is_treeish $line[2]; then
+            __git_tree_files ${PREFIX:-.} $line[2] && ret=0
+          elif __git_is_blob $line[1] && __git_is_blob $line[2]; then
+            _nothing
+          else
+            __git_changed-in-working-tree_files && ret=0
+          fi
+          ;;
+      esac
+      ;;
+  esac
 }
 
 (( $+functions[_git-fetch] )) ||
 _git-fetch () {
-  _arguments \
-    $common_fetch_args \
-    ':repository:__git_any_repositories' \
-    '*:refspec:__git_ref_specs' && ret=0
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  local -a fetch_options
+  __git_setup_fetch_options
+
+  _arguments -w -C -S -s \
+    $fetch_options \
+    '--multiple[allow several repository arguments]' \
+    '*:: :->repository-or-group-or-refspec' && ret=0
+
+  case $state in
+    (repository-or-group-or-refspec)
+      if (( CURRENT > 1 )) && [[ -z ${opt_args[(I)--multiple]} ]]; then
+        __git_ref_specs && ret=0
+      else
+        _alternative \
+          'remotes::__git_remotes' \
+          'remotes-groups::__git_remotes_groups' \
+          'local-repositories::__git_local_repositories' \
+          'remote-repositories::__git_remote_repositories' && ret=0
+      fi
+      ;;
+  esac
 }
 
 (( $+functions[_git-format-patch] )) ||
 _git-format-patch () {
-  _arguments \
-    $diff_args \
-    '(-h --help)'{-h,--help}'[display usage information]' \
-    '(-k --keep-subject -n --numbered)'{-k,--keep-subject}'[do not strip/add \[PATCH\] from the first line of the commit message]' \
-    '(-k --keep-subject -n --numbered)'{-n,--numbered}'[name output in \[PATCH n/m\] format]' \
-    '--start-number=[start numbering patches at given number]: :_guard "[[\:digit\:]]" "patch number"' \
-    '(-o --output-directory --stdout)'{-o,--output-directory}'[store resulting files in given directory]:directory:_directories' \
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  local -a diff_options
+  __git_setup_diff_options
+
+  # TODO: -- is wrong.
+  # TODO: Should filter out --name-only, --name-status, and --check from
+  # $diff_options.
+  _arguments -w -C -S -s \
+    $diff_options \
+    '--[limit the number of patches to prepare]: :__git_guard_number "number of patches to prepare"' \
+    '(-o --output-directory --stdout)'{-o,--output-directory}'[store resulting files in given directory]: :_directories' \
+    '(-n --numbered -N --no-numbered -k --keep-subject)'{-n,--numbered}'[name output in \[PATCH n/m\] format]' \
+    '(-n --numbered -N --no-numbered -k --keep-subject)'{-N,--no-numbered}'[name output in \[PATCH\] format]' \
+    '--start-number=[start numbering patches at given number]: :__git_guard_number "patch number"' \
+    '--numbered-files[use only number for file name]' \
+    '(-n --numbered -N --no-numbered -k --keep-subject --subject-prefix)'{-k,--keep-subject}'[do not strip/add \[PATCH\] from the first line of the commit message]' \
+    '(-s --signoff)'{-s,--signoff}'[add Signed-off-by: line to the commit message]' \
     '(-o --output-directory)--stdout[output the generated mbox on standard output (implies --mbox)]' \
-    '(-s --signoff)'{-s,--signoff}'[add "Signed-off-by:" line to the commit message]' \
-    '--attach=-[create attachments instead of inlining patches]::git version string' \
-    '--thread[make the second and subsequent mails refer to the first]' \
+    '(         --no-attach --inline)--attach=-[create attachments instead of inlining patches]::boundary' \
+    '(--attach             --inline)--no-attach[disable creation of attachments]' \
+    '(--attach --no-attach         )--inline=-[inline patches]::boundary' \
+    '(         --no-thread)--thread=-[make the second and subsequent mails refer to the first]::style:((shallow\:"all refer to the first"
+                                                                                                        deep\:"each refers to the previous"))' \
+    '(--thread            )--no-thread[do not thread messages]' \
     '--in-reply-to=[make the first mail a reply to the given message]:message id' \
     '--ignore-if-in-upstream[do not include a patch that matches a commit in the given range]' \
-    '--suffix[use the given suffix for filenames]:filename suffix' \
-    '--subject-prefix=[use the given prefix instead of \[PATCH\]]:prefix' \
-    '--cc=[add a Cc: header, may be given multiple times]:email address' \
+    '(-k --keep-subject)--subject-prefix=[use the given prefix instead of \[PATCH\]]:prefix' \
+    '*--to=[add To: header to email headers]: :_email_addresses' \
+    '*--cc=[add Cc: header to email headers]: :_email_addresses' \
+    '*--add-header=[add an arbitrary header to email headers]:header' \
     '--cover-letter[generate a cover letter template]' \
+    '(            --no-signature)--signature=[add a signature]:signature' \
+    '(--signature               )--no-signature[do not add a signature]' \
+    '--suffix=[use the given suffix for filenames]:filename suffix' \
     '--no-binary[do not output contents of changes in binary files, only note that they differ]' \
-    ':commit range:__git_commit_ranges' && ret=0
+    '--root[treat the revision argument as a range]' \
+    ': :->commit-or-commit-range' && ret=0
+
+  case $state in
+    (commit-or-commit-range)
+      if [[ -n ${opt_args[(I)--root]} ]]; then
+        __git_commits && ret=0
+      else
+        __git_commit_ranges && ret=0
+      fi
+      ;;
+  esac
 }
 
 (( $+functions[_git-gc] )) ||
 _git-gc () {
-  _arguments \
+  _arguments -w -S -s \
     '--aggressive[more aggressively optimize]' \
     '--auto[check whether housekeeping is required]' \
+    '(        --no-prune)--prune=[prune loose objects older than given date]: :__git_datetimes' \
+    '(--prune           )--no-prune[do not prune any loose objects]' \
     '--quiet[suppress all progress reports]' && ret=0
 }
 
@@ -1790,6 +776,7 @@ _git-gc () {
 _git-grep () {
   local -a pattern_operators
 
+  # TODO: Need to deal with grouping with ( and )
   if (( words[(I)-e] == CURRENT - 2 )); then
     pattern_operators=(
       '--and[both patterns must match]'
@@ -1800,10 +787,14 @@ _git-grep () {
   local curcontext=$curcontext state line
   declare -A opt_args
 
-  _arguments -A '--*' \
-    '--cached[grep blobs registered in index file instead of working tree]' \
+  # TODO: Need to implement -<num> as a shorthand for -C<num>
+  _arguments -C -A '-*' \
+    '(-O --open-files-in-pager --no-index)--cached[search blobs registered in index file instead of working tree]' \
+    '(--cached)--no-index[search files in current directory, not just treacked files]' \
     '(-a --text)'{-a,--text}'[process binary files as if they were text]' \
     '(-i --ignore-case)'{-i,--ignore-case}'[ignore case when matching]' \
+    '-I[do not match pattern in binary files]' \
+    '--max-depth=[descend at most given levels of directories]:__git_guard_number depth' \
     '(-w --word-regexp)'{-w,--word-regexp}'[match only whole words]' \
     '(-v --invert-match)'{-v,--invert-match}'[select non-matching lines]' \
     '(   -H)-h[supress output of filenames]' \
@@ -1811,23 +802,30 @@ _git-grep () {
     '--full-name[output paths relative to the project top directory]' \
     '(-E --extended-regexp -G --basic-regexp)'{-E,--extended-regexp}'[use POSIX extended regexes]' \
     '(-E --extended-regexp -G --basic-regexp)'{-G,--basic-regexp}'[use POSIX basic regexes]' \
+    '(-F --fixed-strings)'{-F,--fixed-strings}'[do not interpret pattern as a regex]' \
     '-n[prefix the line number to matching lines]' \
     '(-l --files-with-matches -L --files-without-match --name-only)'{-l,--files-with-matches,--name-only}'[show only names of matching files]' \
     '(-l --files-with-matches -L --files-without-match)'{-L,--files-without-match}'[show only names of non-matching files]' \
-    {-z,--null}'[output \0 after filenames]' \
+    '(--cached -O --open-files-in-pager)'{-O,--open-files-in-pager}'=-[open matching files in pager]::_path_commands' \
+    '(-z --null)'{-z,--null}'[output \0 after filenames]' \
     '(-c --count)'{-c,--count}'[show number of matching lines in files]' \
-    '-A[show trailing context]: :_guard "[[\:digit\:]]#" lines' \
-    '-B[show leading context]: :_guard "[[\:digit\:]]#" lines' \
-    '-C[show context]: :_guard "[[\:digit\:]]#" lines' \
+    '(        --no-color)--color=-[color matches]:: :__git_color_whens' \
+    '(--color           )---no-color[do not color matches]' \
+    '-A[show trailing context]: :__git_guard_number lines' \
+    '-B[show leading context]: :__git_guard_number lines' \
+    '-C[show context]: :__git_guard_number lines' \
+    '(-p --show-function)'{-p,--show-function}'[show preceding line containing function name of match]' \
     '(1)*-f[read patterns from given file]:pattern file:_files' \
     '(1)*-e[use the given pattern for matching]:pattern' \
     $pattern_operators \
     '--all-match[all patterns must match]' \
-    ':pattern:' \
-    '*::tree-or-file:->files' && ret=0
+    ':pattern' \
+    '*:: :->tree-or-file' && ret=0
 
+  # TODO: If --cached, --no-index, -O, or --open-files-in-pager was given,
+  # don’t complete treeishs.
   case $state in
-    (files)
+    (tree-or-file)
       integer first_tree last_tree start end
 
       (( start = words[(I)(-f|-e)] > 0 ? 1 : 2 ))
@@ -1835,7 +833,7 @@ _git-grep () {
 
       for (( i = start; i <= end; i++ )); do
         [[ line[i] == '--' ]] && break
-        git cat-file -e "${(Q)line[i]}^{tree}" 2>/dev/null || break
+        __git_is_treeish $line[i] || break
         if (( first_tree == 0 )); then
           (( first_tree = last_tree = i ))
         else
@@ -1843,158 +841,313 @@ _git-grep () {
         fi
       done
 
+      # TODO: Need to respect --cached and --no-index here.
       if (( last_tree == 0 || last_tree == end )); then
         if (( first_tree == 0 )); then
           _alternative \
-            'tree:tree:__git_trees' \
-            "file:file:__git_cached_files" && ret=0
+            'treeishs::__git_tree_ishs' \
+            'files::__git_cached_files' && ret=0
         else
           _alternative \
-            'tree:tree:__git_trees' \
-            "tree file:tree-files:__git_tree_files .  $line[first_tree,last_tree]" && ret=0
+            'treeishs::__git_trees' \
+            "files::__git_tree_files ${PREFIX:-.} $line[first_tree,last_tree]" && ret=0
         fi
       else
         if (( first_tree == 0 )); then
-          __git_cached_files
+          __git_cached_files && ret=0
         else
-          __git_tree_files . $line[first_tree,last_tree]
+          __git_tree_files ${PREFIX:-.} $line[first_tree,last_tree] && ret=0
         fi
       fi
       ;;
   esac
 }
 
-(( $+functions[_git-log] )) ||
-_git-log () {
+(( $+functions[_git-gui] )) ||
+_git-gui () {
   local curcontext=$curcontext state line
   declare -A opt_args
 
-  __git_setup_revision_arguments
-
-  _arguments -S \
-    $revision_arguments \
-    '--source[show which ref each commit is reached from]' \
-    '--decorate[print out ref names of any commits that are shown]' \
-    '*:file-or-branch:->files' && ret=0
+  _arguments -C \
+    '--version[display version information]' \
+    ': :->command' \
+    '*:: :->arg'
 
   case $state in
-    (files)
-      _arguments -S \
-        '::branch:__git_commit_ranges2' \
-        '*:index file:__git_cached_files' && ret=0
+    (command)
+      local -a commands
+
+      commands=(
+        blame:'start a blame viewer'
+        browser:'start a tree browser'
+        citool:'arrange to make one commit'
+        version:'display version information')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (arg)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (blame)
+          _git-blame
+          ;;
+        (browser)
+          _arguments -C \
+            ':: :__git_revisions' \
+            '*:: :->file' && ret=0
+
+          case $state in
+            (file)
+              __git_is_treeish $line[1] && __git_tree_files ${PREFIX:-.} $line[1] && ret=0
+              ;;
+          esac
+          ;;
+        (citool)
+          _git-citool
+          ;;
+        (version)
+          _nothing
+          ;;
+        (*)
+          _nothing
+          ;;
+      esac
       ;;
   esac
 }
 
-# TODO: repository needs fixing
-(( $+functions[_git-ls-remote] )) ||
-_git-ls-remote () {
-  _arguments \
-    '(-h --heads)'{-h,--heads}'[show only refs under refs/heads]' \
-    '(-t --tags)'{-t,--tags}'[show only refs under refs/tags]' \
-    $upload_pack_arg \
-    ':repository:__git_any_repositories' \
-    '*: :__git_references' && ret=0
+(( $+functions[_git-init] )) ||
+_git-init () {
+  _arguments -w -S -s \
+    '(-q --quiet)'{-q,--quiet}'[do not print any results to stdout]' \
+    '--bare[create a bare repository]' \
+    '--template=[directory to use as a template for the object database]: :_directories' \
+    '--shared=[share repository amongst several users]:: :__git_repository_permissions' \
+    ':: :_directories' && ret=0
+}
+
+(( $+functions[_git-log] )) ||
+_git-log () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  local -a log_options revision_options
+  __git_setup_log_options
+  __git_setup_revision_options
+
+  _arguments -w -C -s \
+    $log_options \
+    $revision_options \
+    '(-)--[start file arguments]' \
+    '*:: :->commit-range-or-file' && ret=0
+
+  case $state in
+    (commit-range-or-file)
+      case $CURRENT in
+        (1)
+          if [[ -n ${opt_args[(I)--]} ]]; then
+            __git_cached_files && ret=0
+          else
+            _alternative \
+              'commit-ranges::__git_commit_ranges' \
+              'cached-files::__git_cached_files' && ret=0
+          fi
+          ;;
+        (*)
+          # TODO: Write a wrapper function that checks whether we have a
+          # committish range or comittish and calls __git_tree_files
+          # appropriately.
+          if __git_is_committish_range $line[1]; then
+            __git_tree_files ${PREFIX:-.} $(__git_committish_range_last $line[1]) && ret=0
+          elif __git_is_committish $line[1]; then
+            __git_tree_files ${PREFIX:-.} $line[1] && ret=0
+          else
+            __git_cached_files && ret=0
+          fi
+          ;;
+      esac
+  esac
 }
 
 (( $+functions[_git-merge] )) ||
 _git-merge () {
-  _arguments \
-    "$merge_args[@]" \
-    '-m:merge message' \
-    '*:remote:__git_commits' && ret=0
+  local -a merge_options
+  __git_setup_merge_options
+
+  _arguments -w -S -s \
+    $merge_options \
+    '-m[set the commit message to be used for the merge commit]:merge message' \
+    '(                    --no-rerere-autoupdate)--rerere-autoupdate[allow the rerere mechanism to update the index]' \
+    '(--rerere-autoupdate                       )--no-rerere-autoupdate[do not allow the rerere mechanism to update the index]' \
+    '*: :__git_commits' && ret=0
 }
 
 (( $+functions[_git-mv] )) ||
 _git-mv () {
-  _arguments \
-    '-f[force renaming/moving even if targets exist]' \
-    '-k[skip move/renames that would lead to errors]' \
-    '-n[only show what would happen]' \
-    '*:source:__git_cached_files' \
-    ':destination:_files' && ret=0
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -S -s \
+    '(-f --force)'{-f,--force}'[rename/move even if targets exist]' \
+    '-k[skip rename/move that would lead to errors]' \
+    '(-n --dry-run)'{-n,--dry-run}'[only show what would happen]' \
+    ':source:__git_cached_files' \
+    '*:: :->source-or-destination' && ret=0
+
+  case $state in
+    (source-or-destination)
+      _alternative \
+        'cached-files:source:__git_cached_files' \
+        'directories:destination directory:_directories' && ret=0
+      ;;
+  esac
+}
+
+(( $+functions[_git-notes] )) ||
+_git-notes () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -C \
+    '--ref=[manipulate the notes tree in given ref]: :__git_notes_refs' \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
+
+  case $state in
+    (command)
+      local -a commands
+
+      commands=(
+        list:'list notes object for given object'
+        add:'add notes for a given object'
+        copy:'copy notes from one object to another'
+        append:'append notes to a given object'
+        edit:'edit notes for a given object'
+        show:'show notes for a given object'
+        remove:'remove notes for a given object'
+        prune:'remove all notes for non-existing/unreachable objects')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (list|show|edit|remove)
+          _arguments \
+            ': :__git_commits' && ret=0
+          ;;
+        (add)
+          # TODO: Only complete commits that don’t have notes already, unless
+          # -f or --force has been given.
+          _arguments -w -S -s \
+            '*'{-m,--message=}'[use given note message]:message' \
+            '*'{-F,--file=}'[take note message from given file]:note message file:_files' \
+            '(-C --reuse-message)'{-C,--reuse-message=}'[take note message from given blob object]: :__git_blobs' \
+            '(-c --reedit-message)'{-c,--reedit-message=}'[take note message from given blob object and edit it]: :__git_blobs' \
+            '(-f --force)'{-f,--force}'[overwrite existing note]' \
+            ': :__git_commits' && ret=0
+          ;;
+        (copy)
+          # TODO: --for-rewrite is undocumented.
+          _arguments -w -S -s \
+            '(-f --force)'{-f,--force}'[replace existing note]' \
+            '(:)--stdin[read objects from stdin]' \
+            '(:--stdin)--for-rewrite=[load rewriting config for given command]:command:(amend rebase)' \
+            ': :__git_commits' \
+            ': :__git_commits' && ret=0
+          ;;
+        (append)
+          _arguments -w -S -s \
+            '*'{-m,--message=}'[use given note message]:message' \
+            '*'{-F,--file=}'[take note message from given file]:note message file:_files' \
+            '(-C --reuse-message)'{-C,--reuse-message=}'[take note message from given blob object]: :__git_blobs' \
+            '(-c --reedit-message)'{-c,--reedit-message=}'[take note message from given blob object and edit it]: :__git_blobs' \
+            ': :__git_commits' && ret=0
+          ;;
+        (*)
+          _nothing
+          ;;
+      esac
+      ;;
+  esac
 }
 
 (( $+functions[_git-pull] )) ||
 _git-pull () {
+  local -a merge_options fetch_options
+  __git_setup_merge_options
+  __git_setup_fetch_options
+
   _arguments \
-    "$merge_args[@]" \
-    $common_fetch_args \
-    ':repository:__git_any_repositories' \
-    '*:refspec:__git_ref_specs' && ret=0
+    $merge_options \
+    '(         --no-rebase)--rebase[perform a rebase after fetching]' \
+    '(--rebase            )--no-rebase[do not perform a rebase after fetching]' \
+    $fetch_options \
+    ': :__git_any_repositories' \
+    '*: :__git_ref_specs' && ret=0
 }
 
-# NOTE: For --receive-pack we use _files to complete, even though this will
-# only complete files on the local end, not the remote end.  Still, it may be
-# helpful to get some sort of completion going, perhaps modifying the path
-# later on to match the remote end.
 (( $+functions[_git-push] )) ||
 _git-push () {
-  _arguments \
-    $force_ref_arg \
+  # NOTE: For --receive-pack we use _files to complete, even though this will
+  # only complete files on the local end, not the remote end.  Still, it may be
+  # helpful to get some sort of completion going, perhaps modifying the path
+  # later on to match the remote end.
+  _arguments -w -S -s \
     '--all[push all refs under refs/heads/]' \
     '--mirror[push all refs under refs/heads/ and refs/tags/ and delete non-existing refs]' \
-    '--dry-run[do everything except actually send the updates]' \
-    '--tags[all tags under "$GIT_DIR/refs/tags" are pushed]' \
-    '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[path to git-receive-pack on remote]:remote path:_files' \
-    '--repo=-[default repository to use]:repository:__git_any_repositories' \
+    '(-n --dry-run)'{-n,--dry-run}'[do everything except actually send the updates]' \
+    '--porcelain[produce machine-readable output]' \
+    '--delete[delete all listed refs from the remote repository]' \
+    '--tags[all tags under refs/tags are pushed]' \
+    '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[path to git-receive-pack on remote]:remote git-receive-pack:_files' \
+    '(-f --force)'{-f,--force}'[allow refs that are not ancestors to be updated]' \
+    '(:)--repo=[default repository to use]:repository:__git_any_repositories' \
+    '(-u --set-upstream)'{-u,--set-upstream}'[add upstream reference for each branch that is up to date or pushed]' \
     '(       --no-thin)--thin[try to minimize number of objects to be sent]' \
     '(--thin          )--no-thin[do not try to minimize number of objects to be sent]' \
-    $verbose_arg \
-    '::repository:__git_any_repositories' \
-    '*::refspec:__git_ref_specs' && ret=0
+    '(-q --quiet -v --verbose --progress)'{-q,--quiet}'[suppress all output]' \
+    '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]' \
+    '(-q --quiet)--progress[output progress information]' \
+    ':: :__git_any_repositories' \
+    '*: :__git_ref_specs' && ret=0
 }
 
 (( $+functions[_git-rebase] )) ||
 _git-rebase () {
-  if [[ $words[2] == --(abort|continue|skip) ]]; then
-    _message 'no more options'
-  else
-    _arguments \
-      '--onto[start new branch with HEAD equal to "newbase"]:newbase:__git_revisions' \
-      '--continue[continue after failure]' \
-      '--abort[abort current rebase]' \
-      '--skip[skip the current patch]' \
-      '--whitespace=-[detect a new or modified line that ends with trailing whitespaces]: :__git_apply_whitespace_strategies' \
-      '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \
-      '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
-      $verbose_arg \
-      '--no-verify[bypass the pre-rebase hook]' \
-      '-C-[ensure that given lines of surrounding context match]: :_guard "[[\:digit\:]]##" "lines of context"' \
-      '(-i --interactive)'{-i,--interactive}'[make a list of commits to be rebased and open in $EDITOR]' \
-      '(-p --preserve-merges)'{-p,--preserve-merges}'[try to recreate merges instead of ignoring them]' \
-      ':upstream branch:__git_revisions' \
-      '::working branch:__git_revisions' && ret=0
-  fi
-}
+  local -a autosquash_opts
 
-(( $+functions[_git-repack] )) ||
-_git-repack () {
-  _arguments -s -w \
-    '(-A)-a[pack all objects into a single pack]' \
-    '(-a)-A[pack all objects into a single pack, but unreachable objects become loose]' \
-    '-d[remove redundant packs after packing]' \
-    '-f[pass "--no-reuse-objects" option to "git pack-objects"]' \
-    '-l[pass "--local" option to "git pack-objects"]' \
-    '-n[do not update server information]' \
-    '-q[pass "-q" option to "git pack-objects"]' \
-    '--max-pack-size=-[maximum size of each output packfile]:MiB' \
-    '--window-memory=-[scale window size dynamically to not use more than N bytes of memory]:bytes' \
-    '--window=-[number of objects to consider when doing delta compression]:N' \
-    '--depth=-[maximum delta depth]:N' && ret=0
-}
-
-(( $+functions[_git-rerere] )) ||
-_git-rerere () {
-  declare -a commands
-
-  commands=(
-    'clear:reset the metadata used by rerere'
-    'diff:output diffs for the current state of the resolution'
-    'status:like diff, but only output filesames'
-    'gc:prune old records of conflicted merges')
+  if (( words[(I)--interactive] )); then
+    autosquash_opts=(
+      '(             --no-autosquash)--autosquash[check for auto-squash boundaries]'
+      '(--autosquash                )--no-autosquash[do not check for auto-squash boundaries]')
+  fi
 
-  _describe -t commands 'command' commands
+  _arguments -A '-*' \
+    '(- :)--continue[continue after resolving merge conflict]' \
+    '(- :)--abort[abort current rebase]' \
+    '(- :)--skip[skip the current patch]' \
+    '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \
+    '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
+    '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]' \
+    '(-q --quiet -v --verbose --stat -n --no-stat)'{-q,--quiet}'[suppress all output]' \
+    '(-q --quiet -v --verbose --stat -n --no-stat)'{-v,--verbose}'[output additional information]' \
+    '--no-verify[bypass the pre-rebase hook]' \
+    '-C-[ensure that given lines of surrounding context match]: :__git_guard_number "lines of context"' \
+    '(-f --force-rebase)'{-f,--force-rebase}'[force rebase even if current branch descends from commit rebasing onto]' \
+    '(-i --interactive)--ignore-whitespace[ignore whitespace in context]' \
+    '(-i --interactive)--whitespace=-[detect a new or modified line that has whitespace errors]: :__git_apply_whitespace_strategies' \
+    '(-i --interactive)--committer-date-is-author-date[use author date as committer date]' \
+    '(-i --interactive --ignore-whitespace --whitespace --committer-date-is-author-date)'{-i,--interactive}'[make a list of commits to be rebased and open in $EDITOR]' \
+    '(-p --preserve-merges --interactive)'{-p,--preserve-merges}'[try to recreate merges instead of ignoring them]' \
+    '(1)--root[rebase all reachable commits]' \
+    $autosquash_opts \
+    '--no-ff[cherry-pick all rebased commits with --interactive, otherwise synonymous to --force-rebase]' \
+    '--onto[start new branch with HEAD equal to given revision]:newbase:__git_revisions' \
+    ':upstream branch:__git_revisions' \
+    '::working branch:__git_branch_names' && ret=0
 }
 
 (( $+functions[_git-reset] )) ||
@@ -2002,431 +1155,1686 @@ _git-reset () {
   local curcontext=$curcontext state line
   typeset -A opt_args
 
-  _arguments -C -S -A '-*' \
-      '(-q --quiet)'{-q,--quiet}'[be quiet, only report errors]' \
-      '::commit:__git_revisions' \
-    - reset-head \
-      '(        --soft --hard --merge --keep)--mixed[reset the index but not the working tree (default)]' \
-      '(--mixed        --hard --merge --keep)--soft[do not touch the index file nor the working tree]' \
-      '(--mixed --soft        --merge --keep)--hard[match the working tree and index to the given tree]' \
-      '(--mixed --soft --hard         --keep)--merge[reset out of a conflicted merge]' \
-      '(--mixed --soft --hard --merge       )--keep[like --hard, but keep local working tree changes]' \
-    - reset-paths \
+  _arguments -w -C -s \
+      '(       --mixed --hard --merge --keep -p --patch -- *)--soft[do not touch the index file nor the working tree]' \
+      '(--soft         --hard --merge --keep -p --patch -- *)--mixed[reset the index but not the working tree (default)]' \
+      '(--soft --mixed        --merge --keep -p --patch -- *)--hard[match the working tree and index to the given tree]' \
+      '(--soft --mixed --hard         --keep -p --patch -- *)--merge[reset out of a conflicted merge]' \
+      '(--soft --mixed --hard --merge        -p --patch -- *)--keep[like --hard, but keep local working tree changes]' \
       '(-p --patch)'{-p,--patch}'[select diff hunks to remove from the index]' \
-      '*::file:->files' && ret=0
+      '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+      '(- 1)--[start file arguments]' \
+      '(--soft --mixed --hard --merge --keep):: :__git_commits' \
+      '(--soft --mixed --hard --merge --keep)*:: :->file' && ret=0
 
   case $state in
-    (files)
-      local commit
+    (file)
+      local commit=HEAD
       if [[ -n $line[1] ]] && __git_is_committish $line[1]; then
         commit=$line[1]
-      else
-        commit=HEAD
       fi
-      __git_tree_files . $commit && ret=0
+      __git_tree_files ${PREFIX:-.} $commit && ret=0
       ;;
   esac
 }
 
 (( $+functions[_git-revert] )) ||
 _git-revert () {
-  _arguments -s -w \
-    '(-e --edit)'{-e,--edit}'[edit the commit before committing the revert]' \
-    '--no-edit[do not edit the commit message]' \
-    '-x[append commit name when cherry-picking]' \
+  _arguments -w -S -s \
+    '(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \
     '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
+    '(-e --edit)--no-edit[do not edit the commit message]' \
     '(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \
     '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
-    ':commit:__git_commits' && ret=0
+    ': :__git_commits' && ret=0
+}
+
+(( $+functions[_git-rm] )) ||
+_git-rm () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -S -s \
+    '(-f --force)'{-f,--force}'[override the up-to-date check]' \
+    '(-n --dry-run)'{-n,--dry-run}'[do not actually remove the files, just show if they exist in the index]' \
+    '-r[allow recursive removal when a leading directory-name is given]' \
+    '--cached[only remove files from the index]' \
+    '--ignore-unmatch[exit with 0 status even if no files matched]' \
+    '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+    '*:: :->file' && ret=0
+
+  case $state in
+    (file)
+      if [[ -n ${opt_args[(I)--cached]} ]]; then
+        __git_changed-in-index_files && ret=0
+      else
+        __git_cached_files && ret=0
+      fi
+      ;;
+  esac
 }
 
-# TODO: should take all arguments found in setup_revisions() (probably more or
-# less what git-rev-list takes).
 (( $+functions[_git-shortlog] )) ||
 _git-shortlog () {
-  __git_setup_revision_arguments
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  _arguments -S \
-    $revision_arguments \
+  local -a revision_options
+  __git_setup_revision_options
+
+  # TODO: should take all arguments found in setup_revisions() (probably more
+  # or less what git-rev-list takes).
+  _arguments -w -C -S -s \
     '(: -)'{-h,--help}'[print a short usage message and exit]' \
     '(-n --numbered)'{-n,--numbered}'[sort according to number of commits]' \
     '(-s --summary)'{-s,--summary}'[suppress commit description]' \
-    '*::commitish:__git_committishs' && ret=0
-}
+    '(-e --email)'{-e,--email}'[show email addres of each author]' \
+    '-w-[linewrap the output]:: :->wrap' \
+    $revision_options \
+    '*: :__git_commits' && ret=0
 
-# TODO: --date-order is undocumented.
-# TODO: Better completion of --reflog.
-(( $+functions[_git-show-branch] )) ||
-_git-show-branch () {
-  _arguments -S \
-    '(--more        --independent --merge-base)--list[synonym to "--more=-1"]' \
-    - branches \
-      '(-a --all)'{-a,--all}'[show both remote-tracking branches and local branches]' \
-      '(-r --remotes)'{-r,--remotes}'[show remote-tracking branches]' \
-      '(       --list --independent --merge-base)--more=-[go given number of commit beyond common ancestor (no ancestry if negative)]:: :_guard "[[\:digit\:]]" limit' \
-      '(--more --list               --merge-base)--independent[show only the reference that can not be reached from any of the other]' \
-      '(--more --list --independent             )--merge-base[act like "git-merge-base -a" but with two heads]' \
-      '--current[include current branch to the list of revs]' \
-      '(          --sha1-name)--no-name[do not show naming strings for each commit]' \
-      '(--no-name            )--sha1-name[name commits with unique prefix of object names]' \
-      '--topo-order[show commits in topological order]' \
-      '--topics[show only commits that are NOT on the first branch given]' \
-      '--sparse[output merges that are reachable from multiple tips being shown]' \
-      '--date-order[undocumented]' \
-      '*:revision:__git_revisions' \
-    - reflogs \
-      '(-g --reflog)'{-g,--reflog=-}'[show reflog entries for given ref]::number of entries and base' \
-      ':reference:__git_references' && ret=0
-}
-
-(( $+functions[_git-status] )) ||
-_git-status () {
-  _git-commit
+  case $state in
+    (wrap)
+      if [[ -prefix [[:digit:]]#,[[:digit:]]#,[[:digit:]]# ]]; then
+        compset -P '[[:digit:]]#,[[:digit:]]#,'
+        __git_guard_number 'indent of second and subsquent wrapped lines'
+      elif [[ -prefix [[:digit:]]#,[[:digit:]]# ]]; then
+        compset -P '[[:digit:]]#,'
+        compset -S ',[[:digit:]]#'
+        __git_guard_number 'indent of first wrapped line'
+      else
+        compset -S ',[[:digit:]]#,[[:digit:]]#'
+        __git_guard_number 'line width'
+      fi
+      ;;
+  esac
 }
-__git_zstyle_default ':completion::complete:git-status:argument-rest:*' ignore-line yes
 
+(( $+functions[_git-show] )) ||
+_git-show () {
+  local curcontext=$curcontext state line
+  typeset -A opt_args
 
-(( $+functions[__git_stashes] )) ||
-__git_stashes () {
-  local expl
-  declare -a st_list
+  local -a log_options revision_options
+  __git_setup_log_options
+  __git_setup_revision_options
 
-  st_list=(${${(f)"$(_call_program stashes git stash list 2>/dev/null)"}/: */})
-  __git_command_successful || return
+  _arguments -w -C -s \
+    $log_options \
+    $revision_options \
+    '*:: :->object' && ret=0
 
-  _wanted tags expl stash-list compadd $* - $st_list
+  case $state in
+    (object)
+      _alternative \
+        'commits::__git_commits' \
+        'tags::__git_tags' \
+        'trees::__git_trees' \
+        'blobs::__git_blobs' && ret=0
+      ;;
+  esac
 }
 
 (( $+functions[_git-stash] )) ||
 _git-stash () {
-  local expl
-  local -a stash_cmds
-
-  stash_cmds=(
-    apply:"restore the changes recorded in the stash"
-    branch:"branch off at the commit at which the stash was originally created"
-    clear:"remove all the stashed states"
-    drop:"remove a single stashed state from the stash list"
-    list:"list the stashes that you currently have"
-    pop:"remove and apply a single stashed state from the stash list"
-    save:"save your local modifications to a new stash"
-    show:"show the changes recorded in the stash as a diff"
-  )
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  if (( CURRENT == 2 )); then
-    _describe -t command "git-stash commands" stash_cmds && ret=0
-  else
-    case $words[2] in
-      (apply)
-        _arguments \
-          '--index[try to reinstate the index'\''s changes too]' \
-          '*:stash:__git_stashes' && ret=0
-        ;;
-      (branch)
-        _arguments \
-          '2:branch name:' \
-          '*:stash:__git_stashes' && ret=0
-        ;;
-      (drop|pop|show)
-        _arguments \
-          '*:stash:__git_stashes' && ret=0
-        ;;
-      (save)
-        _arguments \
-          '--keep-index[all changes already added to the index are left intact]' \
-          '*: :->end' && ret=0
+  _arguments -C \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
 
-        [[ $state == 'end' ]] && _message 'message'
-        ;;
-      (*)
-        _nothing
-        ;;
-    esac
-  fi
+  case $state in
+    (command)
+      local -a commands
+
+      commands=(
+        save:'save your local modifications to a new stash'
+        list:'list the stashes that you currently have'
+        show:'show the changes recorded in the stash as a diff'
+        pop:'remove and apply a single stashed state from the stash list'
+        apply:'apply the changes recorded in the stash'
+        branch:'branch off at the commit at which the stash was originally created'
+        clear:'remove all the stashed states'
+        drop:'remove a single stashed state from the stash list'
+        create:'create a stash without storing it in the ref namespace')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (save)
+          _arguments -S \
+            '(--keep-index)--patch[interactively select hunks from diff between HEAD and working tree to stash]' \
+            '(             --no-keep-index)--keep-index[all changes already added to the index are left intact]' \
+            '(--keep-index                )--no-keep-index[all changes already added to the index are undone]' \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '::message' && ret=0
+          ;;
+        (list)
+          local -a log_options revision_options
+          __git_setup_log_options
+          __git_setup_revision_options
+
+          _arguments -s -w \
+            $log_options \
+            $revision_options && ret=0
+          ;;
+        (show)
+          local diff_options
+          __git_setup_diff_options
+
+          _arguments -S -s -w \
+            $diff_options \
+            ':: :__git_stashes' && ret=0
+          ;;
+        (pop|apply)
+          _arguments -
+            '--index[try to reinstate the changes added to the index as well]' \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            ':: :__git_stashes' && ret=0
+        (branch)
+          _arguments \
+            ': :__git_guard_branch-name' \
+            ':: :__git_stashes' && ret=0
+          ;;
+        (clear)
+          _nothing
+          ;;
+        (drop)
+          _arguments \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            ':: :__git_stashes' && ret=0
+          ;;
+        (create)
+          _nothing
+          ;;
+        (*)
+          _nothing
+          ;;
+      esac
+      ;;
+  esac
 }
 
-(( $+functions[_git-verify-tag] )) ||
-_git-verify-tag () {
-  _arguments \
-    ':tag:__git_tags' && ret=0
+(( $+functions[_git-status] )) ||
+_git-status () {
+  local -a branch_opts
+
+  if (( $words[(I)-s|--short] )); then
+    branch_opts=('(-b --branch)'{-b,--branch}'[show branch and tracking info]')
+  fi
+
+  _arguments -w -S -s \
+    '(-s --short)'{-s,--short}'[output in short format]' \
+    $branch_opts \
+    '(-s --short)--porcelain[produce machine-readable output]' \
+    '(-u --untracked-files)'{-u-,--untracked-files=-}'[show untracked files]::mode:((no\:"show no untracked files" \
+                                                                                     normal\:"show untracked files and directories" \
+                                                                                     all\:"also show untracked files in untracked directories (default)"))' \
+    '--ignore-submodules[ignore changes to submodules]:: :__git_ignore_submodules_whens' \
+    '(--porcelain)-z[use NUL termination on output]' \
+    '*: :__git_ignore_line_inside_arguments _files' && ret=0
 }
 
-# TODO: This should take those arguments that git-diff-tree can take, as well.
-(( $+functions[_git-whatchanged] )) ||
-_git-whatchanged () {
-  __git_setup_revision_arguments
+(( $+functions[_git-submodule] )) ||
+_git-submodule () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  _arguments -S \
-    $revision_arguments \
-    '1::commit id:__git_commits2' \
-    '*:managed file:__git_cached_files' && ret=0
+  _arguments -C -A '-*' \
+    '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
+
+  case $state in
+    (command)
+      declare -a commands
+
+      commands=(
+        add:'add given repository as a submodule'
+        status:'show the status of a submodule'
+        init:'initialize a submodule'
+        update:'update a submodule'
+        summary:'show commit summary between given commit and working tree/index'
+        foreach:'evaluate shell command in each checked-out submodule'
+        sync:'synchronize submodule settings')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (add)
+          # TODO: Second argument should only complete relative paths inside
+          # the current repository.
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '(-b --branch)'{-b,--branch}'[branch of repository to add as submodule]' \
+            '(-f --force)'{-f,--force}'[allow adding an otherwise ignored submodule path]' \
+            '--reference=[remote repository to clone]: :__git_any_repositories' \
+            ': :__git_any_repositories' \
+            ':: :_directories' && ret=0
+          ;;
+        (status)
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '--cached[use commit stored in the index]' \
+            '--recursive[traverse submodules recursively]' \
+            '*: :__git_ignore_line_inside_arguments __git_submodules' && ret=0
+          ;;
+        (init)
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '*: :__git_ignore_line_inside_arguments __git_submodules' && ret=0
+          ;;
+        (update)
+          # TODO: --init not properly documented.
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '(-N --no-fetch)'{-N,--no-fetch}'[do not fetch new objects from repository]' \
+            '--merge[merge commit recorded in superproject into current branch of submodule]' \
+            '--rebase[rebase current branch onto commit recorded in superproject]' \
+            '--reference=[remote repository to clone]: :__git_any_repositories' \
+            '--recursive[traverse submodules recursively]' \
+            '--init[initialize uninitialized submodules]' \
+            '*: :__git_ignore_line_inside_arguments __git_submodules' && ret=0
+          ;;
+        (summary)
+          _arguments -C -A '-*' \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '--cached[use commit stored in the index]' \
+            '--files[compare commit in index with submodule HEAD commit]' \
+            '(-n --summary-limit)'{-n,--summary-limit}'[limit summary size]: :__git_guard_number "limit"' \
+            '(-)--[start submodule arguments]' \
+            '*:: :->commit-or-submodule' && ret=0
+
+          case $state in
+            (commit-or-submodule)
+              if (( CURRENT == 1 )) && [[ -z ${opt_args[(I)--]} ]]; then
+                _alternative \
+                  'commits::__git_commits' \
+                  'submodules::__git_submodules' && ret=0
+              else
+                __git_ignore_line __git_submodules && ret=0
+              fi
+              ;;
+          esac
+          ;;
+        (foreach)
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '--recursive[traverse submodules recursively]' \
+            '(-):command: _command_names -e' \
+            '*::arguments: _normal' && ret=0
+          ;;
+        (sync)
+          _arguments -S \
+            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+            '*: :__git_ignore_line_inside_arguments __git_submodules' && ret=0
+          ;;
+        (*)
+          _nothing
+          ;;
+      esac
+      ;;
+  esac
 }
 
-(( $+functions[_git-applypatch] )) ||
-_git-applypatch () {
-  _arguments \
-    ':message file:_files' \
-    ':patch file:_files' \
-    ':info file:_files' \
-    '::signoff file:__git_signoff_file' && ret=0
+(( $+functions[_git-tag] )) ||
+_git-tag () {
+  local -a message_opts
+
+  if (( words[(I)-[asu]] )); then
+    message_opts=(
+      '(   -F)-m+[specify tag message]:message'
+      '(-m   )-F+[read tag message from given file]:message file:_files')
+  fi
+
+  _arguments -A '-*' \
+    - creation \
+      '(   -s -u)-a[create an unsigned, annotated tag]' \
+      '(-a    -u)-s[create an signed and annotated tag]' \
+      '(-a -s   )-u[create a tag, annotated and signed with the given key]: :__git_gpg_secret_keys' \
+      '-f[replace existing tag]' \
+      $message_opts \
+      ': :__git_tags' \
+      ':: :__git_commits' \
+    - deletion \
+      '-d[delete tags]' \
+      '*:: :__git_ignore_line_inside_arguments __git_tags' \
+    - listing \
+      '-n+[limit line output of annotation]: :__git_guard_number "limit"' \
+      '-l[list tags matching pattern]:pattern' \
+      '--contains=[only list tags which contain the specified commit]: :__git_commits' \
+    - verification \
+      '-v[verifies gpg signutare of tags]' && ret=0
 }
 
-# TODO: Need to combine the list of attributes defined in __git_attributes.
-(( $+functions[_git-check-attr] )) ||
-_git-check-attr () {
-  local -a attributes
+# Ancillary Commands (Manipulators)
 
-  attributes=(crlf ident filter diff merge)
+(( $+functions[_git-config] )) ||
+_git-config () {
+  local name_arg value_arg
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  local only_attributes=1
-  for (( i = 2; i < $#words; i++ )); do
-    if (( attributes[(I)$words[i]] == 0 )); then
-      only_attributes=0
-      break
-    fi
-  done
+  if (( words[(I)--get-regexp] )); then
+    name_arg=':name regex'
+  elif (( words[(I)--get-colorbool] )); then
+    name_arg=':: :->is-a-tty'
+  elif (( words[(I)--get-color] )); then
+    name_arg='::default'
+  elif (( words[(I)--remove-section|--rename-section] )); then
+    name_arg=': :->section'
+  elif (( words[(I)--get|--get-all] )); then
+    name_arg=': :->gettable-option'
+  else
+    name_arg=': :->option'
+  fi
 
-  if (( !only_attributes || words[(I)--] )); then
-    __git_files && ret=0
+  if (( words[(I)--rename-section] )); then
+    value_arg=': :->section'
   else
-    _alternative \
-      'files:file:__git_files' \
-      'attributes:attribute:__git_attributes' && ret=0
+    value_arg=': :->value'
   fi
-}
 
-# TODO: archive/branch can use _arch_archives perhaps?
-(( $+functions[_git-archimport] )) ||
-_git-archimport () {
-  _arguments \
-    '-a[auto-register archives at http://mirrors.sourcecontrol.net]' \
-    '-D[attempt to import trees that have been merged from]: :_guard "[[\:digit\:]]#" depth' \
-    '-f[use the fast patchset import strategy]' \
-    $help_arg \
-    '-o[use old-style branch names]' \
-    '-T[create a tag for every commit]' \
-    '-t[use given directory as temporary directory]:directory:_directories' \
-    $verbose_arg \
-    ':archive/branch' \
-    '::archive/branch'
-}
+  # TODO --local is undocumented.
+  _arguments -w -C -S -s \
+    '(         --system --local -f --file)--global[use user-global config file]' \
+    '(--global          --local -f --file)--system[use system-wide config file]' \
+    '(--global --system         -f --file)--local[use local config file]' \
+    '(--global --system -f --file)'{-f+,--file=}'[use given config file]:config file:_files' \
+    '(       --int --bool-or-int --path)--bool[setting is a boolean]' \
+    '(--bool       --bool-or-int --path)--int[setting is an integer]' \
+    '(--bool --int               --path)--bool-or-int[setting is an integer]' \
+    '(--bool --int --bool-or-int       )--path[setting is a path]' \
+    '(-z --null)'{-z,--null}'[end values with NUL and newline between key and value]' \
+    $name_arg \
+    $value_arg \
+    '::value regex' \
+    - '(actions)' \
+      '(-z --null)--replace-all[replace all values of the given key]' \
+      '(3 -z --null)--add[add new value without altering any existing ones]' \
+      '(2)--get[get the first matching value of the key]' \
+      '(2)--get-all[get all matching values of the key]' \
+      '(3 --bool --int --bool-or-int --path -z --null)--remove-section[remove the given section]' \
+      '(3 --bool --int --bool-or-int --path -z --null)--rename-section[rename the given section]'  \
+      '(2 --bool --int --bool-or-int --path -z --null)--unset[remove the first matching value of the key]' \
+      '(2 --bool --int --bool-or-int --path -z --null)--unset-all[remove all matching values of the key]' \
+      '(: --bool --int --bool-or-int --path)'{-l,--list}'[list all variables set in config file]' \
+      '(2)--get-regexp[like "--get-all", but interpret "name" as a regular expression]' \
+      '(2 3 --bool --int --bool-or-int --path -z --null)--get-colorbool[check if color should be used]: :->gettable-colorbool-option' \
+      '(2 3 --bool --int --bool-or-int --path -z --null)--get-color[find color setting]: :->gettable-color-option' \
+      '(-e --edit --bool --int --bool-or-int --path -z --null)'{-e,--edit}'[open config file for editing]' && ret=0
+
+  # TODO: Most all _path_commands should be able to take arguments and so on.
+  # How do we deal with that and how do we quote the whole argument to git
+  # config?
+  # TODO: Add merge.*.(name|driver|recursive) and diff.*.(command|funcname)
+  # (see gitattributes(5)).
+  # TODO: .path options should take absolute paths.
+  declare -a git_options_static
+  git_options_static=(
+    advice.pushNonFastForward:'show advice when git push refuses non-fast-forward refs::->bool:true'
+    advice.statusHints:'show advice in output of git status::->bool:true'
+    advice.commitBeforeMerge:'show advice when git merge refuses to merge::->bool:true'
+    advice.resolveConflict:'show advice when conflict prevents operation from being performed::->bool:true'
+    advice.implicitIdentity:'show advice when identity is guessed from system settings::->bool:true'
+    advice.detachedHead:'show advice when entering detached-HEAD state::->bool:true'
+    blame.blankboundary:'show blank SHA-1 for boundary commits::->bool:false'
+    blame.showroot:'show root commits as normal commits::->bool:false'
+    blame.date:'date format to use in output::__git_date_formats:iso'
+    core.fileMode:'track changes to the executable bit of files::->bool:true'
+    core.ignoreCygwinFSTricks:'use Cygwin stat()/lstat()::->bool:true'
+    core.ignorecase:'use workarounds for non-case-sensitive filesystems::->bool:false'
+    core.trustctime:'trust inode change time::->bool:true'
+    core.quotepath:'escape characters in paths on output::->bool:false'
+    core.eol:'line ending type::->core.eol:native'
+    core.safecrlf:'verify that CRLF conversion is reversible::->core.safecrlf:false'
+    core.autocrlf:'convert CRLFs to and from system specific::->core.autocrlf:false'
+    core.symlinks:'create symbolic links for indexed symbolic links upon creation::->bool:true'
+    core.gitProxy:'command to execute to establish a connection to remote server:proxy command:_path_commands'
+    core.ignoreStat:'ignore modification times of files::->bool:false'
+    core.preferSymlinkRefs:'use symbolic links for symbolic-reference files::->bool:false'
+    core.bare:'use a repository without a working tree::->bool:false'
+    core.worktree:'path to the root of the work tree:work tree:_directories'
+    core.logAllRefUpdates:'log updates of references::->bool:true'
+    core.repositoryFormatVersion:'internal variable determining the repository version:version:->string'
+    core.sharedRepository:'what kind of sharing is done for this repository::->permission:false'
+    core.warnAmbiguousRefs:'warn if a ref name is ambiguous::->bool:true'
+    core.compression:'level of compression to apply to packs::->compression:-1'
+    core.loosecompression:'level of compression to apply to non-pack files::->compression:1'
+    core.packedGitWindowSize:'size of mappings of pack files:pack window size:->bytes'
+    core.packedGitLimit:'maximum number of bytes to map from pack files:maximum pack file map size:->bytes'
+    core.deltaBaseCacheLimit:'maximum size of cache for base objects:maximum base objects cache size:->bytes:16m'
+    core.bigFileThreshold:'maximum size of files to compress:maximum compress size:->bytes:512m'
+    core.excludesfile:'additional file to use for exclusion:excludes file:_files'
+    core.askpass:'program to use for asking for passwords:password command:_path_commands'
+    core.editor:'editor to use for editing messages:editor:_path_commands'
+    core.pager:'pager to use for paginating output:pager:_path_commands'
+    core.whitespace:'list of common whitespace problems to notice::->core.whitespace'
+    core.fsyncobjectfiles:'fsync() when writing object files::->bool:false'
+    core.preloadindex:'use parallel index preload for operations like git diff::->bool:false'
+    core.createObject:'take steps to prevent overwriting existing objects::->core.createObject:link'
+    core.notesRef:'show notes in given refs:refs:->string:refs/notes/commits'
+    core.sparseCheckout:'use sparse checkout::->bool:false'
+    add.ignore-errors:'ignore indexing errors when adding files::->bool:false'
+    am.keepcr:'keep CR characters when splitting mails::->bool:false'
+    apply.ignorewhitespace:'ignore whitespace changes::->apply.ignorewhitespace:no'
+    apply.whitespace:'default value for the --whitespace option::->apply.whitespace:error'
+    branch.autosetupmerge:'set up new branches for git pull::->bool:true'
+    branch.autosetuprebase:'rebase new branches of merge for autosetupmerge::->branch.autosetuprebase:never'
+    'branch.*.remote:what remote git fetch and git push should fetch form/push to::__git_remotes'
+    'branch.*.merge:default refspec to be marked for merging::__git_ref_specs'
+    'branch.*.mergeoptions:default options for merging::->branch.mergeoptions'
+    'branch.*.rebase:rebase on top of fetched branch::->bool:false'
+    'browser.*.cmd:browser command to use:browser:_path_commands'
+    'browser.*.path:path to use for the browser:absolute browser path:_files -g "*(*)"'
+    clean.requireForce:'require --force for git clean to actually do something::->bool:true'
+    color.branch:'color output of git branch::->color-bool'
+    color.branch.current:'color of the current branch::->color'
+    color.branch.local:'color of a local branch::->color'
+    color.branch.remote:'color of a remote branch::->color'
+    color.branch.plain:'color of other branches::->color'
+    color.diff:'color output of git diff::->color-bool'
+    color.diff.plain:'color of context text::->color'
+    color.diff.meta:'color of meta-information::->color'
+    color.diff.frag:'color of hunk headers::->color'
+    color.diff.func:'color of function in hunk header::->color'
+    color.diff.old:'color of removed lines::->color'
+    color.diff.new:'color of added lines::->color'
+    color.diff.commit:'color of commit headers::->color'
+    color.diff.whitespace:'color of whitespace errors::->color'
+    color.decorate.branch:'color of branches::->color'
+    color.decorate.remoteBranch:'color of remote branches::->color'
+    color.decorate.tag:'color of tags::->color'
+    color.decorate.stash:'color of stashes::->color'
+    color.decorate.HEAD:'color of HEAD::->color'
+    color.grep:'whether or not to color output of git grep::->color-bool'
+    color.grep.context:'color of non-matching text in context lines::->color'
+    color.grep.filename:'color of filename prefix::->color'
+    color.grep.function:'color of function name lines::->color'
+    color.grep.linenumber:'color of line number prefix::->color'
+    color.grep.match:'color of matching text::->color'
+    color.grep.selected:'color of non-matching text in selected lines::->color'
+    color.grep.separator:'color of separators between fields in a line::->color'
+    color.interactive:'whether or not to color in interactive mode::->color-bool'
+    color.interactive.prompt:'color of prompt::->color'
+    color.interactive.header:'color of header::->color'
+    color.interactive.help:'color of help::->color'
+    color.interactive.error:'color of error::->color'
+    color.pager:'feed colored output to pager::->bool:true'
+    color.showbranch:'color output of git show-branch::->color-bool'
+    color.status:'color output of git status::->color-bool'
+    color.status.header:'color of header text::->color'
+    color.status.added:'color of added, but not yet committed, files::->color'
+    color.status.updated:'color of updated, but not yet committed, files::->color'
+    color.status.changed:'color of changed, but not yet added in the index, files::->color'
+    color.status.untracked:'color of files not currently being tracked::->color'
+    color.status.nobranch:'color of no-branch warning::->color'
+    color.ui:'color output of capable git commands::->color-bool'
+    commit.status:'include status information in commit message template::->bool:true'
+    commit.template:'template file for commit messages:template:_files'
+    diff.autorefreshindex:'run git update-index --refresh before git diff::->bool:true'
+    diff.external:'command to generate diff with:diff command:_path_commands'
+    diff.mnemonicprefix:'use mnemonic source and destination prefixes::->bool:false'
+    diff.noprefix:'strip source and destination prefixes::->bool:false'
+    diff.renameLimit:'number of files to consider when detecting copy/renames:rename limit:->int'
+    diff.renames:'try to detect renames::->diff.renames:true'
+    diff.ignoreSubmodules:'ignore submodules::->bool:false'
+    diff.suppressBlankEmpty:'inbihit printing space before empty output lines::->bool:false'
+    diff.tool:'diff tool to use::__git_difftools'
+    'difftool.*.cmd:command to invoke for the diff tool::_path_commands'
+    'difftool.*.path:path to use for the diff tool:absolute diff tool path:_files -g "*(*)"'
+    difftool.prompt:'prompt before each invocation of the diff tool::->bool:true'
+    diff.wordRegex:'regex used to determine what a word is when performing word-by-word diff:regex:->string'
+    diff.guitool:'diff tool with gui to use::__git_difftools'
+    fetch.unpackLimit:'maximum number of objects to unpack when fetching:unpack limit:->int'
+    format.attach:'use multipart/mixed attachments::->bool:false'
+    format.numbered:'use sequence numbers in patch subjects::->format.numbered:auto'
+    format.headers:'additional email headers to include in email patches:headers:->string'
+    format.to:'additional email recipients of patches::->string'
+    format.cc:'additional carbon-copy email recipients of patches:recipients:->string'
+    format.subjectprefix:'prefix to use for subjects:prefix:->string'
+    format.signature:'signature to use:signature:->string'
+    format.suffix:'default suffix for output files from git-format-patch:suffix:->string'
+    format.pretty:'pretty format for log/show/whatchanged:format:->string'
+    format.thread:'threading style to use::->format.thread:false'
+    format.signoff:'enable --signoff by default::->bool:false'
+    'gc.*.reflogexpire:grace period for git reflog expire::->days:90'
+    'gc.*.reflogexpireunreachable:grace period for git reflog expire for unreachable entries::->days:30'
+    gc.aggressiveWindow:'window size used in delta compression algorithm:->int:250'
+    gc.auto:'minimum limit for packing loose objects with --auto::->int:6700'
+    gc.autopacklimit:'minimum limit for packing packs with --auto::->int:50'
+    gc.packrefs:'allow git gc to run git pack-refs::->gc.packrefs:true'
+    gc.pruneexpire:'grace period for pruning::->days+now'
+    gc.reflogexpire:'grace period for git reflog expire::->days:90'
+    gc.reflogexpireunreachable:'grace period for git reflog expire for unreachable entries::->days:30'
+    gc.rerereresolved:'number of days to keep records of resolved merges::->days:60'
+    gc.rerereunresolved:'number of days to keep records of unresolved merges::->days:15'
+    gitcvs.commitmsgannotation:'string to append to each commit message::->string'
+    gitcvs.enabled:'enable the cvs server interface::->bool:false'
+    gitcvs.logfile:'name of log file for cvs pserver:log file:_files'
+    gitcvs.dbname:'name of database to use:database name:->string'
+    gitcvs.dbdriver:'name of DBI driver to use::->gitcvs.dbdriver:SQLite'
+    gitcvs.dbuser:'username to connect to database as:database user:_users'
+    gitcvs.dbpass:'password to use when connecting to database:password:->string'
+    gitcvs.dbTableNamePrefix:'database table name prefix:prefix:->string'
+    'gitcvs.*.commitmsgannotation:string to append to each commit message:annotation:->string'
+    'gitcvs.*.enabled:enable the cvs server interface::->bool:false'
+    'gitcvs.*.logfile:name of log file for cvs pserver:log file:_files'
+    'gitcvs.*.dbname:name of database to use:database name:->string'
+    'gitcvs.*.dbdriver:name of DBI driver to use:DBI driver:->string'
+    'gitcvs.*.dbuser:username to connect to database as::_users'
+    'gitcvs.*.dbpass:password to use when connecting to database:password:->string'
+    'gitcvs.*.dbTableNamePrefix:database table name prefix:prefix:->string'
+    gitcvs.usecrlfattr:'use end-of-line conversion attributes::->bool:false'
+    gitcvs.allbinary:'treat all files from CVS as binary::->bool:false'
+    gui.commitmsgwidth:'width of commit message window:width:->int:75'
+    gui.diffcontext:'number of context lines used in diff window:context:->int:5'
+    gui.encoding:'encoding to use for displaying file contents::->encoding'
+    gui.matchtrackingbranch:'create branches that track remote branches::->bool:false'
+    gui.newbranchtemplate:'suggested name for new branches:template:->string'
+    gui.pruneduringfetch:'prune tracking branches when performing a fetch::->bool:false'
+    gui.trustmtime:'trust file modification timestamp::->bool:false'
+    gui.spellingdictionary:'dictionary to use for spell checking commit messages:dictionary:_files'
+    gui.fastcopyblame:'try harder during blame detection::->bool:false'
+    gui.copyblamethreshold:'threshold to use in blame location detection:threshold:->string'
+    gui.blamehistoryctx:'specify radius of history context in days for selected commit::->days'
+    guitool.cmd:'shell command line to execute::_path_commands'
+    guitool.needsfile:'require that a diff is selected for command to be available::->bool:false'
+    guitool.noconsole:'suppress command output::->bool:false'
+    guitool.norescan:'skip rescanning for changes to the working directory::->bool:false'
+    guitool.confirm:'show a confirmation dialog::->bool:false'
+    guitool.argprompt:'prompt for arguments:argument prompt:->string'
+    guitool.revprompt:'prompt for a single revision:revision prompt:->string'
+    guitool.revunmerged:'show only unmerged branches in revprompt::->bool:false'
+    guitool.title:'title of prompt dialog:prompt title:->string'
+    guitool.prompt:'prompt to display:prompt:->string'
+    help.browser:'browser used to display help in web format::__git_browsers'
+    help.format:'default help format used by git help::->help.format'
+    help.autocorrect:'execute corrected mistyped commands::->bool:false'
+    http.proxy:'HTTP proxy to use:proxy:_urls'
+    http.sslVerify:'verify the SSL certificate for HTTPS::->bool:true'
+    http.sslCert:'file containing SSL certificates for HTTPS:SSL certificate file:_files'
+    http.sslKey:'file containing the SSL private key for HTTPS:SSL private key file:_files'
+    http.sslCertPasswordProtected:'prompt for a password for the SSL certificate::->bool:false'
+    http.sslCAInfo:'file containing CA certificates to verify against for HTTPS:CA certificates file:_files'
+    http.sslCAPath:'directory containing files with CA certificates to verify against for HTTPS:CA certificates directory:_directories'
+    http.maxRequests:'how many HTTP requests to launch in parallel:maximum number of requests:->int:5'
+    http.minSessions:'number of curl sessions to keep across requests:mininmum number of sessions:->int:1'
+    http.postBuffer:'maximum size of buffer used by smart HTTP transport when POSTing:maximum POST buffer size:->bytes:1m'
+    http.lowSpeedLimit:'lower limit for HTTP transfer-speed:low transfer-speed limit:->int'
+    http.lowSpeedTime:'duration for http.lowSpeedLimit:time:->int'
+    http.noEPSV:'disable the use of the EPSV ftp-command::->bool:false'
+    http.useragent:'user agent presented to HTTP server:user agent string:->string'
+    http.getanyfile:'allow clients to read any file within repository::->bool:true'
+    http.uploadpack:'serve git fetch-pack and git ls-remote clients::->bool:true'
+    http.receivepack:'serve git send-pack clients::->bool:true'
+    i18n.commitEncoding:'character encoding commit messages are stored in::->encoding'
+    i18n.logOutputEncoding:'character encoding commit messages are output in::->encoding'
+    imap.folder:'IMAP folder to use with git imap-send:IMAP folder name::_mailboxes'
+    imap.tunnel:'tunneling command to use for git imap-send:tunnel command:_path_commands'
+    imap.host:'host git imap-send should connect to::_hosts'
+    # TODO: If imap.host is set, complete users on that system.
+    imap.user:'user git imap-send should log in as::_users'
+    imap.pass:'password git imap-send should use when logging in:password:->string'
+    imap.port:'port git imap-send should connect on::_ports'
+    imap.sslverify:'verify server certificate::->bool:true'
+    imap.preformattedHTML:'use HTML encoding when sending a patch::->bool:false'
+    imap.authMethod:'authentication method used::->imap.authMethod'
+    init.templatedir:'directory from which templates are copied:template directory:_directories'
+    instaweb.browser:'browser to use when browsing with gitweb::__git_browsers'
+    instaweb.httpd:'HTTP-daemon command-line to execute for instaweb:daemon:_path_commands'
+    instaweb.local:'bind to 127.0.0.1::->bool:false'
+    instaweb.modulepath:'module path for the Apache HTTP-daemon for instaweb:module directory:_directories'
+    instaweb.port:'port to bind HTTP daemon to for instaweb::_ports'
+    interactive.singlekey:'accept one-letter input without Enter::->bool:false'
+    log.date:'default date-time mode::__git_date_formats'
+    log.decorate:'type of ref names to show::__git_log_decorate_formats'
+    log.showroot:'show initial commit as a diff against an empty tree::->bool:true'
+    mailinfo.scissors:'remove everything in body before a scissors line::->bool:false'
+    mailmap.file:'augmenting mailmap file:mailmap file:_files'
+    man.viewer:'man viewer to use for help in man format::__git_man_viewers'
+    'man.*.cmd:the command to invoke the specified man viewer:man command:_path_commands'
+    'man.*.path:path to use for the man viewer:absolute man tool path:_files -g "*(*)"'
+    merge.conflictstyle:'style used for conflicted hunks::->merge.conflictstyle:merge'
+    merge.log:'include summaries of merged commits in new merge commit messsages::->bool:false'
+    merge.renameLimit:'number of files to consider when detecting copy/renames during merge:limit:->int'
+    merge.renormalize:'use canonical representation of files during merge::->bool:false'
+    merge.stat:'print the diffstat between ORIG_HEAD and merge at end of merge::->bool:true'
+    merge.tool:'tool used by git mergetool during merges::__git_mergetools'
+    merge.verbosity:'amount of output shown by recursive merge strategy::->merge.verbosity:2'
+    'merge.*.name:human-readable name for custom low-level merge driver:name:->string'
+    'merge.*.driver:command that implements a custom low-level merge driver:merge command:_path_commands'
+    'merge.*.recursive:low-level merge driver to use when performing internal merge between common ancestors::__git_builtin_merge_drivers'
+    'mergetool.*.path:path to use for the merge tool:absolute merge tool path:_files -g "*(*)"'
+    'mergetool.*.cmd:command to invoke for the merge tool:merge command:_path_commands'
+    'mergetool.*.trustExitCode:trust the exit code of the merge tool::->bool:false'
+    mergetool.keepBackup:'keep the original file with conflict markers::->bool:true'
+    mergetool.keepTemporaries:'keep temporary files::->bool:false'
+    mergetool.prompt:'prompt before each invocation of the merge tool::->bool:true'
+    notes.displayRef:'refname to show notes from::->refname'
+    notes.rewrite.amend:'copy notes from original to rewritten commit when running git amend::->bool:true'
+    notes.rewrite.rebase:'copy notes from original to rewritten commit when running git rebase::->bool:true'
+    notes.rewriteMode:'what to do when target commit already has a not when rewriting::->notes.rewriteMode'
+    notes.rewriteRef:'refname to use when rewriting::->refname'
+    pack.window:'size of window:window size:->int:10'
+    pack.depth:'maximum delta depth:maximum delta depth:->int:50'
+    pack.windowMemory:'window size limit:maximum window size:->bytes:0'
+    pack.compression:'compression level::->compression:-1'
+    pack.deltaCacheSize:'maximum amount of memory for caching deltas:maximum delta cache size:->bytes:256m'
+    pack.deltaCacheLimit:'maximum size of deltas:maximum delta size:->int:1000'
+    pack.threads:'number of threads to use for searching for best delta matches:number of threads:->int'
+    pack.indexVersion:'default pack index version:index version:->string'
+    pack.packSizeLimit:'maximum size of packs:maximum size of packs:->bytes'
+    pull.octopus:'default merge strategy to use when pulling multiple branches::__git_merge_strategies'
+    pull.twohead:'default merge strategy to use when pulling a single branch::__git_merge_strategies'
+    push.default:'action git push should take if no refspec is given::->push.default'
+    rebase.stat:'show a diffstat of what changed upstream since last rebase::->bool:false'
+    rebase.autosquash:'autosquash by default::->bool:false'
+    receive.autogc:'run git gc --auto after receiving data::->bool:true'
+    receive.fsckObjects:'check all received objects::->bool:true'
+    receive.unpackLimit:'maximum number of objects received for unpacking into loose objects:unpack limit:->int'
+    receive.denyDeletes:'deny a ref update that deletes a ref::->bool:false'
+    receive.denyDeleteCurrent:'deny a ref update that deletes currently checked out branch::->bool:false'
+    receive.denyCurrentBranch:'deny a ref update of currently checked out branch::->receive.denyCurrentBranch'
+    receive.denyNonFastForwards:'deny a ref update that is not a fast-forward::->bool:false'
+    receive.updateserverinfo:'run git update-server-info after receiving data::->bool:false'
+    'remote.*.url:URL of a remote repository::__git_any_repositories'
+    'remote.*.pushurl:push URL of a remote repository::__git_any_repositories'
+    'remote.*.proxy:URL of proxy to use for a remote repository::_urls'
+    'remote.*.fetch:default set of refspecs for git fetch::__git_ref_specs'
+    'remote.*.push:default set of refspecs for git push::__git_ref_specs'
+    'remote.*.mirror:push with --mirror::->bool:false'
+    'remote.*.skipDefaultUpdate:skip this remote by default::->bool:false'
+    'remote.*.skipFetchAll:skip this remote by default::->bool:false'
+    'remote.*.receivepack:default program to execute on remote when pushing:git receive-pack command:_path_commands'
+    'remote.*.uploadpack:default program to execute on remote when fetching:git upload-pack command:_path_commands'
+    'remote.*.tagopt:options for retrieving remote tags::->remote.tagopt'
+    'remote.*.vcs:interact with the remote through git-remote helper:remote VCS:->string'
+    repack.usedeltabaseoffset:'use delta-base offsets::->bool:true'
+    rerere.autoupdate:'update index after resolution::->bool:false'
+    rerere.enabled:'record resolved conflicts::->bool'
+    sendemail.smtpencryption:'encryption method to use::->sendemail.smtpencryption'
+    sendemail.aliasesfile:'file containing email aliases:email aliases file:_files'
+    sendemail.aliasfiletype:'format of aliasesfile::->sendemail.aliasfiletype'
+    sendemail.bcc:'value of Bcc\: header::_email_addresses'
+    sendemail.cc:'value of Cc\: header::_email_addresses'
+    sendemail.cccmd:'command to generate Cc\: header with:Cc\: command:_path_commands'
+    sendemail.chainreplyto:'send each email as a reply to the previous one::->bool:false'
+    sendemail.confirm:'type of confirmation required before sending::->sendemail.confirm:auto'
+    sendemail.envelopesender:'envelope sender to send emails as::_email_addresses'
+    sendemail.from:'sender email address::_email_addresses'
+    sendemail.multiedit:'edit all files at once::->bool:false'
+    sendemail.signedoffbycc:'add Signed-off-by\: or Cc\: lines to Cc\: header::->bool:true'
+    sendemail.smtppass:'password to use for SMTP-AUTH:password:->string'
+    sendemail.suppresscc:'rules for suppressing Cc\:::->sendemail.suppresscc'
+    sendemail.suppressfrom:'add From\: address to the Cc\: list::->bool:false'
+    sendemail.to:'value of To\: header::_email_addresses'
+    sendemail.smtpdomain:'FQDN to use for HELO/EHLO commands to SMTP server:smtp domain:_domains'
+    sendemail.smtpserver:'SMTP server to connect to:smtp host:_hosts'
+    sendemail.smtpserverport:'port to connect to SMTP server on:smtp port:_ports'
+    sendemail.smtpuser:'user to use for SMTP-AUTH:smtp user:_users'
+    sendemail.thread:'set In-Reply-To\: and References\: headers::->bool:true'
+    sendemail.validate:'perform sanity checks on patches::->bool:true'
+    'sendemail.*.aliasesfile:file containing email aliases::_files'
+    'sendemail.*.aliasfiletype:format of aliasesfile::->sendemail.aliasfiletype'
+    'sendemail.*.bcc:value of Bcc\: header::_email_addresses'
+    'sendemail.*.cc:value of Cc\: header::_email_addresses'
+    'sendemail.*.cccmd:command to generate Cc\: header with:Cc\: command:_path_commands'
+    'sendemail.*.chainreplyto:send each email as a reply to the previous one::->bool:false'
+    'sendemail.*.confirm:type of confirmation required before sending::->sendemail.confirm:auto'
+    'sendemail.*.envelopesender:envelope sender to send emails as::_email_addresses'
+    'sendemail.*.from:sender email address::_email_addresses'
+    'sendemail.*.multiedit:edit all files at once::->bool:false'
+    'sendemail.*.signedoffbycc:add Signed-off-by\: or Cc\: lines to Cc\: header::->bool:true'
+    'sendemail.*.smtppass:password to use for SMTP-AUTH:password:->string'
+    'sendemail.*.suppresscc:rules for suppressing Cc\:::->sendemail.suppresscc'
+    'sendemail.*.suppressfrom:rules for suppressing From\:::->sendemail.suppressfrom'
+    'sendemail.*.to:value of To\: header::_email_addresses'
+    'sendemail.*.smtpdomain:FQDN to use for HELO/EHLO commands to SMTP server:smtp domain:_domains'
+    'sendemail.*.smtpserver:SMTP server to connect to:smtp host:_hosts'
+    'sendemail.*.smtpserverport:port to connect to SMTP server on:smtp port:_ports'
+    'sendemail.*.smtpuser:user to use for SMTP-AUTH:smtp user:_users'
+    'sendemail.*.thread:set In-Reply-To\: and References\: headers::->bool:true'
+    'sendemail.*.validate:perform sanity checks on patches::->bool:true'
+    sendemail.assume8bitEncoding:'encoding to use for non-ASCII messages::__git_encodings'
+    showbranch.default:'default set of branches for git show-branch::->branch'
+    status.relativePaths:'show paths relative to current directory::->bool:false'
+    status.showUntrackedFiles:'show untracked files::->status.showUntrackedFiles:normal'
+    status.submodulesummary:'include submodule summary::->bool:false'
+    'submodule.*.path:path within project:submodule directory:_directories -qS \:'
+    'submodule.*.url:URL to update from::__git_any_repositories'
+    'submodule.*.update:update strategy to use::->submodule.update'
+    'submodule.*.ignore:ignore modifications to submodules with git status and git diff-*::->submodule.ignore'
+    svn.noMetadata:'disable git-svn-id: lines at end of commits::->bool:false'
+    svn.useSvmProps:'use remappings of URLs and UUIDs from mirrors::->bool:false'
+    svn.useSvnsyncProps:'use remappings of URLs and UUIDs for the svnsync command::->bool:false'
+    svn.ignore-paths:'regular expression of paths to not check out:regular expression:->string'
+    svn.brokenSymlinkWorkaround:'apply the broken-symlink check::->bool:true'
+    svn.pathnameencoding:'encoding to recode pathnames into::->encoding'
+    svn.followparent:'follow parent commit::->bool:true'
+    svn.authorsFile:'default authors file:authors file:_files'
+    svn.quiet:'produce less output::->bool:false'
+    'svn-remote.*.noMetadata:disable git-svn-id: lines at end of commits::->bool:false'
+    'svn-remote.*.useSvmProps:use remappings of URLs and UUIDs from mirrors::->bool:false'
+    'svn-remote.*.useSvnsyncProps:use remappings of URLs and UUIDs for the svnsync command::->bool:false'
+    'svn-remote.*.rewriteRoot:alternate root URL to use:root url:_urls'
+    'svn-remote.*.rewriteUUID:remap URLs and UUIDs for mirrors manually::->bool:false'
+    'svn-remote.*.ignore-paths:regular expression of paths to not check out:regular expression:->string'
+    'svn-remote.*.url:URL to connect to::_urls'
+    'svn-remote.*.fetch:fetch specification::__git_ref_specs'
+    'svn-remote.*.branches:branch mappings:branch mapping:->string'
+    'svn-remote.*.tags:tag mappings:tag mapping:->string'
+    tar.umask:'umask to apply::->umask'
+    transfer.unpackLimit:'default value for fetch.unpackLimit and receive.unpackLimit:unpack limit:->int:100'
+    'url.*.insteadOf:string to start URLs with:prefix:->string'
+    'url.*.pushInsteadOf:string to start URLs to push to with:prefix:->string'
+    user.email:'email address used for commits::_email_addresses'
+    user.name:'full name used for commits:name:->string'
+    user.signingkey:'default GPG key to use when creating signed tags::__git_gpg_secret_keys'
+    web.browser:'web browser to use::__git_browsers')
 
-(( $+functions[_git-convert-objects] )) ||
-_git-convert-objects () {
-  _nothing
+  case $state in
+    (section)
+      __git_config_sections -b '(|)' '^' section-names 'section name' $*
+      ;;
+    (is-a-tty)
+      declare -a values
+      values=(
+        true
+        false
+        auto)
+      _describe -t values 'stdout is a tty' values
+      ;;
+    (option)
+      local label=option
+      declare -a sections sections_and_options options
+
+      [[ -prefix *. ]] && label="${line[1]%.*} option"
+
+      if compset -P '[^.]##.*.'; then
+        declare -a match mbegin mend
+        options+=(${${${${(M)git_options_static:#(#i)${IPREFIX}[^.:]##:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]})
+        options+=(${${${${(M)git_options_static:#(#i)${IPREFIX%%.*}.\*.[^.:]##:*}#(#i)${IPREFIX%%.*}.\*.}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]})
+
+        declare -a labels
+        labels=(
+          'branch.*.:${${line[1]#branch.}%.*} branch option'
+          'browser.*.:${${line[1]#browser.}%.*} browser option'
+          'color.branch.:branch-specific color option'
+          'color.diff.:diff-specific color option'
+          'color.decorate.:git-log---decorate-specific color option'
+          'color.grep.:git-grep-specific color option'
+          'color.interactive.:interaction-specific color option'
+          'color.status.:git-status-specific color option'
+          'difftool.*.:${${line[1]#difftool.}%.*}-specific option'
+          'gc.*.:${${line[1]#gc.}%.*}-specific gc option'
+          'gitcvs.*.:gitcvs ${${line[1]#gitcvs.}%.*}-specific option'
+          'guitool.*.:${${line[1]#gc.}%.*}-specific option'
+          'man.*.:${${line[1]#man.}%.*}-specific man option'
+          'merge.*.:${${line[1]#merge.}%.*}-specific merge option'
+          'mergetool.*.:${${line[1]#mergetool.}%.*}-specific option'
+          'sendemail.*.:${${line[1]#sendemail.}%.*}-specific sendemail option'
+          'submodule.*.:${${line[1]#submodule.}%.*}-submodule-specific option'
+          'url.*.:${${line[1]#url.}%.*}-specific option'
+          'svn-remote.*.:git-svn ${${line[1]#svn-remote.}%.*}-specific option')
+
+        local found
+        found=${${${(M)labels:#(${IPREFIX}|${IPREFIX%%.*}.\*.):*}[1]}#*:}
+        [[ -n $found ]] && label=${(Q)"$(eval "print -rn -- $found")"}
+      elif compset -P '[^.]##.'; then
+        local opt
+        declare -a match mbegin mend
+        for opt in ${${${${(M)git_options_static:#(#i)${IPREFIX}[^.:]##:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]}; do
+          if (( ${git_options_static[(I)${opt%%:*}.*]} )); then
+            sections_and_options+=$opt
+          else
+            options+=$opt
+          fi
+        done
+
+        declare -a subsections
+        subsections=(
+          'color.decorate:git log --decorate options'
+          'gitcvs.ext:ext-connection-method-specific options'
+          'gitcvs.pserver:pserver-connection-method-specific options'
+          'notes.rewrite:commands to copy notes from original for when rewriting commits')
+        sections+=(${${(M)subsections:#${IPREFIX}[^.:]##(.|):*}#${IPREFIX}})
+
+        # TODO: Is it fine to use functions like this before _describe below,
+        # or do we need a tag loop?
+        # TODO: It would be nice to output _message -e TYPE label when the
+        # following functions don’t generate any output in the case of
+        # multi-level options.
+        case $IPREFIX in
+          (alias.)
+            __git_aliases && ret=0
+            ;;
+          (branch.)
+            __git_branch_names -S . && ret=0
+            ;;
+          (browser.)
+            __git_browsers -S . && ret=0
+            ;;
+          (difftool.)
+            __git_difftools -S . && ret=0
+            ;;
+          (gc.)
+            __git_config_sections '^gc\..+\.[^.]+$' refpatterns 'ref pattern' -S . && ret=0
+            ;;
+          (guitool.)
+            __git_config_sections '^guitool\..+\.[^.]+$' guitools 'gui tool' -S . && ret=0
+            ;;
+          (man.)
+            __git_man_viewers -S . && ret=0
+            ;;
+          (merge.)
+            __git_merge_drivers -S . && ret=0
+            ;;
+          (mergetool.)
+            __git_mergetools -S . && ret=0
+            ;;
+          (pager.)
+            __git_aliases_and_commands && ret=0
+            ;;
+          (pretty.)
+            __git_config_sections -a '(|)' '^pretty\..+\.[^.]+$' prettys 'pretty format string' && ret=0
+            ;;
+          (remote.)
+            __git_remotes -S . && ret=0
+            ;;
+          (remotes.)
+            __git_remote-groups && ret=0
+            ;;
+          (sendemail.)
+            __git_sendemail_identities -S . && ret=0
+            ;;
+          (submodule.)
+            __git_submodules -S . && ret=0
+            ;;
+          (url.)
+            __git_config_sections '^url\..+\.[^.]+$' bases base -S . && ret=0
+            ;;
+          (svn-remote.)
+            __git_svn-remotes -S . && ret=0
+            ;;
+        esac
+      else
+        sections=(
+          advice:'options controlling advice'
+          core:'options controlling git core'
+          add:'git add options'
+          alias:'command aliases'
+          am:'git am options'
+          apply:'git apply options'
+          branch:'branch options'
+          browser:'browser options'
+          clean:'git clean options'
+          color:'color options'
+          commit:'git commit options'
+          diff:'diff options'
+          difftool:'difftools'
+          fetch:'git fetch options'
+          format:'format options'
+          gc:'git gc options'
+          gitcvs:'git-cvs options'
+          gui:'git gui options'
+          guitool:'git gui tool options'
+          help:'git help options'
+          http:'http options'
+          i18n:'internationalization options'
+          imap:'IMAP options'
+          init:'git init options'
+          instaweb:'git web options'
+          interactive:'options controlling interactivity'
+          log:'git log options'
+          mailmap:'mailmap options'
+          man:'man options'
+          merge:'git merge options'
+          mergetool:'mergetools'
+          notes:'git notes options'
+          pack:'options controlling packing'
+          pager:'pager options'
+          pretty:'pretty formats'
+          pull:'git pull options'
+          push:'git push options'
+          rebase:'git rebase options'
+          receive:'git receive options'
+          remote:'remotes'
+          remotes:'remotes groups'
+          repack:'repack options'
+          rerere:'git rerere options'
+          sendemail:'git send-email options'
+          showbranch:'showbranch options'
+          status:'git status options'
+          submodule:'git submodule options'
+          tar:'git tar-tree options'
+          transfer:'options controlling transfers'
+          url:'URL prefixes'
+          user:'options controlling user identity'
+          web:'web options'
+          svn:'git svn options'
+          svn-remote:'git svn remotes')
+      fi
+
+      # TODO: Add equivalent of -M 'r:|.=* r:|=*' here so that we can complete
+      # b.d.c to browser.dillo.cmd.
+      _describe -t option-names $label \
+        sections -M 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' -S . -- \
+        sections_and_options -M 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' -qS . -- \
+        options -M 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' && ret=0
+      ;;
+    (gettable-option)
+      _describe -t git-options option \
+        ${${${(0)"$(_call_program gettable-options git config -z --list)"}%%$'\n'*}//:/\\:}
+      ;;
+    (gettable-colorbool-option)
+      __git_config_sections -b '(|)' -a '(|)' '^color\.[^.]+$' gettable-colorbool-options option && ret=0
+      ;;
+    (gettable-color-option)
+      __git_config_sections -b '(|)' -a '(|)' '^color\.[^.]+\..*$' gettable-color-options option && ret=0
+      ;;
+    (value)
+      local current=${${(0)"$(_call_program current "git config $opt_args[(I)--system|--global|--local] ${(kv)opt_args[(I)-f|--file]} -z --get '$line[1]'")"}#*$'\n'}
+      case $line[1] in
+        (alias.*)
+          if [[ -n $current ]]; then
+            compadd - $current && ret=0
+          else
+            _message 'command'
+          fi
+          return
+          ;;
+        (remotes.*)
+          # TODO: Use this strategy for all multi-item values.
+          compset -P '* '
+
+          local suffix
+          if [[ $words[CURRENT] == [\"\']* ]]; then
+            suffix=' '
+          else
+            suffix='\ '
+          fi
+
+          # TODO: Should really only complete unique remotes, that is, not the same
+          # remote more than once in the list.
+          __git_remotes -S $suffix -q && ret=0
+          return
+          ;;
+      esac
+      local z=$'\0'
+      declare -a parts
+      parts=("${(S@0)${git_options_static[(r)(#i)${line[1]}:*]}//(#b)(*[^\\]|):/$match[1]$z}")
+      if (( $#parts < 2 )) && [[ $line[1] == [^.]##.*.[^.]## ]]; then
+        parts=("${(S@0)${git_options_static[(r)(#i)${line[1]%%.*}.\*.${line[1]##*.}:*]}//(#b)(*[^\\]|):/$match[1]$z}")
+      fi
+      (( $#parts > 0 )) || return
+      case $parts[4] in
+        ('->'*)
+          case ${parts[4]#->} in
+            (apply.ignorewhitespace)
+              __git_config_values -- "$current" "$parts[5]" \
+                {no,false,never,none}':do not ignore whitespace' \
+                change:'ignore changes in whitespace' && ret=0
+              ;;
+            (apply.whitespace)
+              __git_apply_whitespace_strategies && ret=0
+              ;;
+            (bool)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" && ret=0
+              ;;
+            (branch)
+              __git_branch_names && ret=0
+              ;;
+            (branch.autosetuprebase)
+              __git_config_values -- "$current" "$parts[5]" \
+                never:'never set branch.*.rebase to true' \
+                local:'set branch.*.rebase to true for tracked branches of local branches' \
+                remote:'set branch.*.rebase to true for tracked branches of remote branches' \
+                always:'set branch.*.rebase to true for all tracking branches' && ret=0
+              ;;
+            (branch.mergeoptions)
+              # TODO: Complete options to git-merge(1).
+              _message 'git-merge options'
+              ;;
+            (bytes)
+              __git_guard_bytes "$parts[2]" && ret=0
+              ;;
+            (color)
+              compset -P '* '
+
+              case ($words[CURRENT]) in
+                (?*' '?*' '*)
+                  if [[ $words[CURRENT] == *(bold|dim|ul|blink|reverse)* ]]; then
+                    __git_colors && ret=0
+                  else
+                    __git_color_attributes && ret=0
+                  fi
+                  ;;
+                (*)
+                  local suffix q_flag
+                  if [[ $words[CURRENT] == [\"\']* ]]; then
+                    suffix=' '
+                    q_flag=-q
+                  else
+                    suffix='\ '
+                  fi
+
+                  if [[ $words[CURRENT] == *(bold|dim|ul|blink|reverse)* ]]; then
+                    __git_colors -S $suffix $q_flag && ret=0
+                  else
+                    _alternative \
+                      'colors::__git_colors -S $suffix $q_flag' \
+                      'attributes::__git_color_attributes -S $suffix $q_flag' && ret=0
+                  fi
+                  ;;
+              esac
+              ;;
+            (color-bool)
+              __git_config_values -t booleans -l boolean -- "$current" false \
+                {never,false,no,off}:"do not $parts[2]" \
+                always:"always $parts[2]" \
+                {auto,true,yes,on}:$parts[2] && ret=0
+              ;;
+            (compression)
+              __git_compression_levels && ret=0
+              ;;
+            (core.autocrlf)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                input:'convert CRLFs on input only' && ret=0
+              ;;
+            (core.createObject)
+              __git_config_values -- "$current" "$parts[5]" \
+                rename:'rename source objects' \
+                link:'hardlink, then delete source objects' && ret=0
+              ;;
+            (core.safecrlf)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                warn:'only warn about irreversible CRLF conversions' && ret=0
+              ;;
+            (core.whitespace)
+              declare -a values
+
+              values=(
+                'blank-at-eol[treat whitespace at the end of the line as an error]'
+                'space-before-tab[treat space character before tab character in initial indent as an error]'
+                'indent-with-non-tab[treat lines indented with 8 or more space characters as an error]'
+                'tab-in-indent[treat lines indented with a tab character as an error]'
+                'blank-at-eof[treat blank lines at the end of the files as an error]'
+                'cr-at-eol[treat carriage-return at the end of the line as part of line terminator]')
+
+              _values -s , $parts[2] $values && ret=0
+              ;;
+            (days)
+              if [[ -n $current ]]; then
+                compadd - $current && ret=0
+              elif [[ -n $parts[5] ]]; then
+                compadd - $parts[5] && ret=0
+              else
+                __git_guard_number 'number of days'
+              fi
+              ;;
+            (days+now)
+              # TODO: This needs to be improved.
+              if [[ -n $current ]]; then
+                compadd - $current && ret=0
+              elif [[ -n $parts[5] ]]; then
+                compadd - $parts[5] && ret=0
+              else
+                __git_guard_number 'number of days'
+              fi
+              ;;
+            (diff.renames)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                {copies,copy}:'try to detect both renames and copies' && ret=0
+              ;;
+            (encoding)
+              __git_encodings && ret=0
+              ;;
+            (eol)
+              __git_config_values -- "$current" "$parts[5]" \
+                lf:'use LF' \
+                crlf:'use CR+LF' \
+                native:'use line ending of platform' && ret=0
+              ;;
+            (format.numbered)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                auto:'use sequence numbers if more than one patch' && ret=0
+              ;;
+            (format.thread)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                deep:'make every mail a reply to the previous one' \
+                shallow:'make every mail a reply to the first one' && ret=0
+              ;;
+            (gc.packrefs)
+              __git_config_booleans "$current" "$parts[5]" "$parts[2]" \
+                notbare:'pack references if the repository has a working directory' && ret=0
+              ;;
+            (gitcvs.dbdriver)
+              # TODO: Would be nice to only include those that are installed, but I
+              # couldn’t figure out a good way of doing that when I wrote this code.
+              __git_config_values -t dbi-drivers -l 'DBI driver' -- "$current" "$part[5]" \
+                SQLite:'use the SQLite database driver' \
+                Pg:'use the Pg database driver' && ret=0
+              ;;
+            (help.format)
+              __git_config_values -- "$current" "$parts[5]" \
+                man:'use man' \
+                info:'use info' \
+                {web,html}:'use HTML' && ret=0
+              ;;
+            (imap.authMethod)
+              __git_config_values -- "$current" "$parts[5]" \
+                CRAM-MD5:'use CRAM-MD5' && ret=0
+              ;;
+            (int)
+              if [[ -n $current ]]; then
+                compadd - $current && ret=0
+              elif [[ -n $parts[5] ]]; then
+                compadd - $parts[5] && ret=0
+              else
+                __git_guard_number 'integer'
+              fi
+              ;;
+            (merge.conflictstyle)
+              __git_config_values -- "$current" "$parts[5]" \
+                merge:'use standard merge style' \
+                diff3:'use diff3 style' && ret=0
+              ;;
+            (merge.verbosity)
+              __git_config_values -t verbosity-levels -l 'verbosity level' -- "$current" "$parts[5]" \
+                0:'only final error message if conflicts were detected'
+                1:'conflicts'
+                2:'conflicts and file changes'
+                5:'debugging information' && ret=0
+              ;;
+            (notes.rewriteMode)
+              __git_config_values -- "$current" "$parts[5]" \
+                overwrite:'overwrite existing notes' \
+                concatenate:'add the note to the existing ones' \
+                ignore:'ignore the new note' && ret=0
+              ;;
+            (permission)
+              __git_repository_permissions && ret=0
+              ;;
+            (push.default)
+              __git_config_values -- "$current" "$parts[5]" \
+                nothing:'do not push anything' \
+                matching:'push all matching branches' \
+                tracking:'push current branch to its upstream branch' \
+                current:'push current branch to branch of same name' && ret=0
+              ;;
+            (receive.denyCurrentBranch)
+              __git_config_values -- "$current" "$parts[5]" \
+                {refuse,true,yes,on}:'update ref to current branch of non-bare repository' \
+                {warn}:'warn about dangers of pushing, but perform it anyway' \
+                {false,no,off}:'do not update ref to current branch of non-bare repository' && ret=0
+              ;;
+            (remote.tagopt)
+              __git_config_values -- "$current" "$parts[5]" \
+                --tags:'automatically follow tags' \
+                --no-tags:'do not automatically follow tags' && ret=0
+              ;;
+            (sendemail.aliasfiletype)
+              __git_config_values -- "$current" "$parts[5]" \
+                elm:'elm(1)' \
+                gnus:'gnus(1)' \
+                mutt:'mutt(1)' \
+                mailrc:'mailrc(5)' \
+                pine:'pine(1)' && ret=0
+              ;;
+            (sendemail.confirm)
+              __git_sendemail_confirm_values && ret=0
+              ;;
+            (sendemail.smtpencryption)
+              __git_sendemail_smtpencryption_values && ret=0
+              ;;
+            (sendemail.suppresscc)
+              __git_sendemail_suppresscc_values && ret=0
+              ;;
+            (status.showUntrackedFiles)
+              __git_config_values -- "$current" "$parts[5]" \
+                no:'do not show untracked files' \
+                normal:'show untracked files and directories' \
+                all:'show all individual files in directories' && ret=0
+              ;;
+            (refname|string)
+              # TODO: Something better?
+              if [[ -n $current ]]; then
+                compadd - $current && ret=0
+              elif [[ -n $parts[5] ]]; then
+                compadd - $parts[5] && ret=0
+              else
+              #  _message 'refname'
+                _message "${parts[3]:-${parts[2]:-value}}"
+              fi
+              ;;
+            (submodule.ignore)
+              __git_config_values -- "$current" "$parts[5]" \
+                all:'never consider submodules modified' \
+                dirty:'ignore all changes to submodule work tree, only take diff between HEAD and recorded commit' \
+                untracked:'show modified tracked files' \
+                none:'show modified tracked and untracked files' && ret=0
+              ;;
+            (umask)
+              _alternative \
+                'values:value:(user)' \
+                'umasks::__git_guard_number umask' && ret=0
+              ;;
+          esac
+          ;;
+        (*)
+          # TODO: Do we need to set up a _requested/_next_label?
+          declare -a action
+          local expl
+          _description values expl "$parts[2]"
+          eval "action=($parts[4])"
+          "$action[1]" "$expl[@]" "${(@)action[2,-1]}" && ret=0
+          ;;
+      esac
+      ;;
+  esac
 }
 
-# TODO: Could use _cvs_root from _cvs for completing argument to -d.
-# TODO: -h is undocumented.
-(( $+functions[_git-cvsexportcommit] )) ||
-_git-cvsexportcommit () {
-  _arguments \
-    '-c[commit automatically if the patch applied cleanly]' \
-    '-p[be pedantic (paranoid) when applying patches]' \
-    '-a[add authorship information]' \
-    '-d[set an alternative CVSROOT to use]:cvsroot' \
-    '-f[force the merge, even if the files are not up to date]' \
-    '-P[force the parent commit, even if it is not a direct parent]' \
-    '-m[prepend the commit message with the provided prefix]:message prefix' \
-    $verbose_arg \
-    $help_arg \
-    '::parent commit id:__git_commits' \
-    ':commit id:__git_commits' && ret=0
+(( $+functions[_git-fast-export] )) ||
+_git-fast-export () {
+  # TODO: * should be git-rev-arg and git-rev-list arguments.
+  _arguments -w -S -s \
+    '--progress=[insert progress statements]: :__git_guard_number interval' \
+    '--signed-tags=[specify how to handle signed tags]:action:((verbatim\:"silently export"
+                                                                warn\:"export, but warn"
+                                                                strip\:"export unsigned tags instead"
+                                                                abort\:"abort on signed tags (default)"))' \
+    '--tag-of-filtered-object=[specify how to handle tags whose tagged object is filtered out]:action:((abort\:"abort on such tags"
+                                                                                                        drop\:"omit such tags"
+                                                                                                        rewrite\:"tag ancestor commit"))' \
+    '-M-[detect moving lines in the file as well]: : :__git_guard_number "number of characters"' \
+    '-C-[detect copies as well as renames with given scope]: :__git_guard_number size' \
+    '--export-marks=[dump internal marks table when complete]: :_files' \
+    '--import-marks=[load marks before processing input]: :_files' \
+    '--fake-missing-tagger=[fake a tagger when tags lack them]' \
+    '--no-data[do not output blocb objects, instead referring to them via their SHA-1 hash]' \
+    '--full-tree[output full tree for each commit]' \
+    '*: :__git_commit_ranges' && ret=0
 }
 
-# TODO: _cvs_root for -d would be nice
-(( $+functions[_git-cvsimport] )) ||
-_git-cvsimport () {
-  _arguments \
-    $author_conversion_file_arg \
-    '-C[specify the git repository to import into]:directory:_directories' \
-    '-d[specify the root of the CVS archive]:cvsroot' \
-    $help_arg \
-    '-i[do not perform a checkout after importing]' \
-    '-k[remove keywords from source files in the CVS archive]' \
-    '-m[attempt to detect merges based on the commit message]' \
-    '*-M[attempt to detect merges based on the commit message with custom pattern]:pattern' \
-    '-o[specify the branch into which you wish to import]:branch:__git_branch_names' \
-    '-P[read cvsps output file]:file:_files' \
-    '-p[specify additional options for cvsps]:cvsps-options' \
-    '-r[the git remote to import into]:remote' \
-    '-s[substitute the "/" character in branch names with given substitution]:substitute' \
-    '-u[convert underscores in tag and branch names to dots]' \
-    '-S[skip paths matching given regex]:regex' \
-    '-a[import all commits, including recent ones]' \
-    '-L[limit the number of commits imported]:limit' \
-    $verbose_arg \
-    '-z[specify timestamp fuzz factor to cvsps]:fuzz-factor' \
-    ':cvsmodule' && ret=0
+(( $+functions[_git-fast-import] )) ||
+_git-fast-import () {
+  _arguments -S -A '-*' \
+    '--date-format=-[type of dates used in input]:format:((raw\:"native Git format"
+                                                           rfc2822\:"standard email format from RFC 2822"
+                                                           now\:"use current time and timezone"' \
+    '--force[force updating modified existing branches]' \
+    '--max-pack-size=-[maximum size of each packfile]: :__git_guard_bytes' \
+    '--big-file-threshold=-[maximum size of blob to create deltas for]: :__git_guard_bytes' \
+    '--depth=-[maximum delta depth for blob and tree deltification]: :__git_guard_number "maximum delta depth"' \
+    '--active-branches=-[maximum number of branches to maintain active at once]: :__git_guard_number "maximum number of branches"' \
+    '--export-marks=-[dump internal marks table when complete]: :_files' \
+    '--import-marks=-[load marks before processing input]: :_files' \
+    '*--relative-marks[paths for export/import are relative to internal directory in current repository]' \
+    '*--no-relative-marks[paths for export/import are not relative to internal directory in current repository]' \
+    '--export-pack-edges=-[list packfiles and last commit on branches in them in given file]: :_files' \
+    '--quiet[disable all non-fatal output]' \
+    '--stats[display statistics about object created]' && ret=0
 }
 
-(( $+functions[_git-cvsserver] )) ||
-_git-cvsserver () {
-  _message "you probably should not be issuing this command; it is an internal git helper"
+(( $+functions[_git-filter-branch] )) ||
+_git-filter-branch () {
+  # TODO: --*-filter should take a whole command line.
+  # TODO: --original should take subdirectory under .git named refs/* or some
+  # such.
+  # TODO: * should be git-rev-arg and git-rev-list arguments.
+  _arguments -S -A '-*' \
+    '--env-filter[filter for modifying environment in which commit will be performed]: :_path_commands' \
+    '--tree-filter[filter for rewriting tree and its contents]: :_path_commands' \
+    '--index-filter[filter for rewriting index]: :_path_commands' \
+    '--parent-filter[filter for rewriting parent list of commit]: :_path_commands' \
+    '--msg-filter[filter for rewriting commit messages]: :_path_commands' \
+    '--commit-filter[filter for rewriting commit]: :_path_commands' \
+    '--tag-name-filter[filter for rewriting tag names]: :_path_commands' \
+    '--subdirectory-filter[only look at histor that touches given directory]: :_directories' \
+    '--prune-empty[ignore empty generated commits]' \
+    '--original[namespace where original commits will be stored]:namespace:_directories' \
+    '-d[temporary directory used for rewriting]: :_directories' \
+    '(-f --force)'{-f,--force}'[force operation]' \
+    '*: :__git_commit_ranges' && ret=0
 }
 
-(( $+functions[_git-lost-found] )) ||
-_git-lost-found () {
-  _nothing
+(( $+functions[_git-mergetool] )) ||
+_git-mergetool () {
+  # TODO: Only complete files with merge conflicts.
+  _arguments -S -A '-*' \
+    '(-t --tool)'{-t,--tool=}'[merge resolution program to use]: :__git_mergetools' \
+    '(-y --no-prompt --prompt)'{-y,--no-prompt}'[do not prompt before invocation of merge resolution program]' \
+    '(-y --no-prompt)--prompt[prompt before invocation of merge resolution program]' \
+    '*:conflicted file:_files' && ret=0
 }
 
 (( $+functions[_git-pack-refs] )) ||
 _git-pack-refs () {
   _arguments \
-    '--all[pack all refs]' \
+    '(      --no-all)--all[pack all refs]' \
+    '(--all         )--no-all[do not pack all refs]' \
     '(        --no-prune)--prune[remove loose refs after packing them]' \
-    '(--prune           )--no-prune[don'\''t remove loose refs after packing them]' && ret=0
-}
-
-# TODO: something better
-(( $+functions[_git-merge-one-file] )) ||
-_git-merge-one-file () {
-  _message "you probably should not be issuing this command"
+    '(--prune           )--no-prune[do not remove loose refs after packing them]' && ret=0
 }
 
 (( $+functions[_git-prune] )) ||
 _git-prune () {
   _arguments -S \
-    '-n[do not remove anything; just report what would have been removed]' \
-    '--expire:time:' \
-    '*::heads:__git_heads' && ret=0
+    '(-n --dry-run)'{-n,--dry-run}'[do not remove anything; just report what would be removed]' \
+    '(-v --verbose)'{-v,--rerbose}'[report all removed objects]' \
+    '--expire[only expire loose objects older than given date]: :__git_datetimes' \
+    '*:: :__git_heads' && ret=0
+}
+
+(( $+functions[_git-reflog] )) ||
+_git-reflog () {
+  declare -a revision_options
+  __git_setup_revision_options
+
+  if [[ $words[2] == --* ]]; then
+    _arguments -S \
+      $revision_options \
+      ':: :__git_references' && ret=0
+  else
+    local curcontext=$curcontext state line
+    declare -A opt_args
+
+    # TODO: -h is undocumented.
+    _arguments -C -S \
+      '(- : *)-h[display usage]' \
+      $revision_options \
+      ': :->command' \
+      '*:: :->option-or-argument' && ret=0
+
+    case $state in
+      (command)
+        declare -a commands
+
+        commands=(
+          'expire:prune old reflog entries'
+          'delete:delete entries from reflog'
+          'show:show log of ref')
+
+        _describe -t commands command commands && ret=0
+        ;;
+      (option-or-argument)
+        curcontext=${curcontext%:*}-$line[1]:
+
+        case $line[1] in
+          (expire)
+            # TODO: -n, --dry-run is undocumented.
+            _arguments -S \
+              '(-n --dry-run)'{-n,--dry-run}'[undocumented]' \
+              '--stale-fix[TODO\: provide a decent description for this option]' \
+              '--expire=-[prune entries older than given time]: :__git_datetimes' \
+              '--expire-unreachable=-[prune entries older than given time and unreachable]: :__git_datetimes' \
+              '--all[prune all refs]' \
+              '--updateref[update ref with SHA-1 of top reflog entry after expiring or deleting]' \
+              '--rewrite[adjust reflog entries to ensure old SHA-1 points to new SHA-1 of previous entry after expring or deleting]' \
+              '--verbose[output additional information]' && ret=0
+            ;;
+          (delete)
+            # TODO: -n, --dry-run is undocumented.
+            _arguments -C -S \
+              '(-n --dry-run)'{-n,--dry-run}'[undocumented]' \
+              '--updateref[update ref with SHA-1 of top reflog entry after expiring or deleting]' \
+              '--rewrite[adjust reflog entries to ensure old SHA-1 points to new SHA-1 of previous entry after expring or deleting]' \
+              '*:: :->reflog-entry' && ret=0
+
+            case $state in
+              (reflog-entry)
+                # TODO: __git_ignore_line doesn’t work here for some reason.
+                __git_ignore_line __git_reflog_entries && ret=0
+                ;;
+            esac
+            ;;
+          (show|--*)
+            _arguments -S \
+              $revision_options \
+              ':: :__git_references' && ret=0
+            ;;
+        esac
+    esac
+  fi
 }
 
 (( $+functions[_git-relink] )) ||
 _git-relink () {
+  # TODO: --help is undocumented.
   _arguments \
     '--safe[stop if two objects with the same hash exist but have different sizes]' \
-    ':directory:_directories' \
-    ':directory:_directories' \
-    '*:directory:_directories' && ret=0
+    '--help[display help]' \
+    ': :_directories' \
+    ': :_directories' \
+    '*: :_directories' && ret=0
 }
 
-# TODO: import stuff from _svn
-# TODO: Improve completion of -P argument.
-(( $+functions[_git-svnimport] )) ||
-_git-svnimport () {
-  _arguments \
-    $author_conversion_file_arg \
-    '-b[specify the name of the SVN branches directory]:directory:_directories' \
-    '-C[specify the git repository to import into]:directory:_directories' \
-    '-d[use direct HTTP-requests if possible for logs only]:path' \
-    '-D[use direct HTTP-requests if possible]:path' \
-    $help_arg \
-    '-i[do not perform a checkout after importing]' \
-    '-l[limit the number of SVN changesets to pull]: :_guard "[[\:digit\:]]#" number' \
-    '-m[attempt to detect merges based on the commit message]' \
-    '-M[attempt to detect merges based on the commit message with custom pattern]:pattern' \
-    '-o[specify the branch into which you wish to import]:branch' \
-    '-r[prepend "rX: " to commit messages, where X is the subversion revision]' \
-    '-s[specify the change number to start importing from]:start-revision' \
-    '-T[specify the name of the SVN tags directory]:directory:_directories' \
-    '-t[specify the name of the SVN trunk]:trunk:_directories' \
-    '-I[import svn:ignore directory property to files with given name]:ignored file:_files' \
-    '-R[specify how often git repository should be repacked]: :_guard "[[\:digit\:]]#" "number of revisions"' \
-    '-P[import only given path of the SVN tree]::_directory' \
-    $verbose_arg \
-    ':svn-repositry-url:_urls' \
-    '::directory:_directories' && ret=0
-}
-
-# TODO: how do we complete argument 1?
-(( $+functions[_git-symbolic-ref] )) ||
-_git-symbolic-ref () {
-  _arguments -A '-*' \
-    '-q[do not issue error if specified name is not a symbolic ref]' \
-    '-m[update reflog for specified name with specied reason]:reason for update' \
-    ':symbolic reference' \
-    '::reference:__git_references' && ret=0
-}
+(( $+functions[_git-remote] )) ||
+_git-remote () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-(( $+functions[_git-tag] )) ||
-_git-tag () {
-  local message_args=
+  _arguments -C \
+    '(-v --verbose)'{-v,--verbose}'[show remote url after name]' \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
 
-  if (( words[(I)-[asu]] )); then
-    message_args=(
-      '(   -F)-m[specify tag message]:message'
-      '(-m   )-F[read tag message from given file]:message file:_files')
-  fi
+  case $state in
+    (command)
+      declare -a commands
 
-  _arguments -A '-*' \
-    - creation \
-      '(   -s -u)-a[create an unsigned, annotated tag]' \
-      '(-a    -u)-s[create an signed and annotated tag]' \
-      '(-a -s   )-u[create a tag, annotated and signed with the given key]:secret key:__git_gpg_secret_keys' \
-      '(   -v)-f[create a new tag even if one with the same name already exists]' \
-      '(-f   )-v[verifies the gpg signutare of the given tag]' \
-      '--contains=[only list tags which contain the specified commit]:commit:__git_committishs' \
-      $message_args \
-      ':tag name:__git_tags' \
-      '::head:__git_revisions' \
-    - deletion \
-      '-d[delete tags]:*:tag names:__git_tags' \
-    - listing \
-      '-l[list tags matching pattern]:pattern' && ret=0
+      commands=(
+        'add:add a new remote'
+        'rename:rename a remote and update all associated tracking branches'
+        'rm:remove a remote and all associated tracking branches'
+        'set-head:set or delete default branch for a remote'
+        'set-branches:change list of branches tracked by a remote'
+        'set-url:change URL for a remote'
+        'show:show information about a given remote'
+        'prune:delete all stale tracking branches for a remote'
+        'update:fetch updates for a set of remotes')
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
+
+      case $line[1] in
+        (add)
+          # TODO: -t and --track should really list branches at url.
+          _arguments -w -S -s \
+            '(-f --fetch)'{-f,--fetch}'[run git fetch on new remote after it has been created]' \
+            '(       --no-tags)--tags[tell git fetch to import every tag from remote repository]' \
+            '(--tags          )--no-tags[tell git fetch to not import every tag from remote repository]' \
+            '*'{-t,--track=}'[track given branch instead of default glob refspec]: :__git_branch_names' \
+            '(-m --master)'{-m,--master=}'[set HEAD of remote to point to given master branch]: :__git_branch_names' \
+            '--mirror[do not use separate remotes]' \
+            ':name:__git_remotes' \
+            ':url:_urls' && ret=0
+          ;;
+        (rename)
+          _arguments \
+            ':old name:__git_remotes' \
+            ':new name:__git_remotes' && ret=0
+          ;;
+        (rm)
+          _arguments \
+            ': :__git_remotes' && ret=0
+          ;;
+        (set-head)
+          # TODO: Second argument should be a branch at url for remote.
+          _arguments -w -S -s \
+            '(- 2)'{-d,--delete}'[delete default branch]' \
+            '(- 2)'{-a,--auto}'[determine default branch automatically]' \
+            ': :__git_remotes' \
+            ': :__git_branch_names' && ret=0
+          ;;
+        (set-branches)
+          # TODO: Branches should be at url.
+          _arguments -w -S -s \
+            '--add[add branches to those already defined]' \
+            ': :__git_remotes' \
+            '*: :__git_branch_names' && ret=0
+          ;;
+        (set-url)
+          # TODO: Old URL should be one of those defined for the remote.
+          _arguments -w -S -s \
+            '(3)--push[manipulate push URLs instead of fetch URLs]' \
+            '--add[add URL to those already defined]' \
+            '(3)--delete[delete all matching URLs]' \
+            ': :__git_remotes' \
+            ':new url:_urls' \
+            ':old url:_urls' && ret=0
+          ;;
+        (show)
+          _arguments -w -S -s \
+            '-n[do not contact the remote for a list of branches]' \
+            '*: :__git_remotes' && ret=0
+          ;;
+        (prune)
+          _arguments -w -S -s \
+            '(-n --dry-run)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \
+            '*: :__git_remotes' && ret=0
+          ;;
+        (update)
+          _arguments -w -S -s \
+            '(-p --prune)'{-p,--prune}'[prune all updated remotes]' \
+            ': :__git_remote-groups' && ret=0
+          ;;
+      esac
+      ;;
+  esac
 }
-__git_zstyle_default ':completion::complete:git-tag:deletion-option-d-rest:*' ignore-line yes
 
-(( $+functions[_git-update-ref] )) ||
-_git-update-ref () {
-  _arguments \
-    '-m[update reflog for specified name with specied reason]:reason for update' \
-    '(:)-d[delete given reference after verifying its value]:symbolic reference:__git_revisions:old reference:__git_revisions' \
-    ':symbolic reference:__git_revisions' \
-    ':new reference:__git_revisions' \
-    '::old reference:__git_revisions' && ret=0
+(( $+functions[_git-repack] )) ||
+_git-repack () {
+  # TODO: --quiet is undocumented.
+  _arguments -w -S -s \
+    '(-A)-a[pack all objects into a single pack]' \
+    '(-a)-A[pack all objects into a single pack, but unreachable objects become loose]' \
+    '-d[remove redundant packs after packing]' \
+    '-l[pass --local option to git pack-objects]' \
+    '-f[pass --no-reuse-delta option to git pack-objects]' \
+    '-F[pass --no-reuse-object option to git pack-objects]' \
+    '(-q --quiet)'{-q,--quiet}'[pass -q option to git pack-objects]' \
+    '-n[do not update server information]' \
+    '--window=-[number of objects to consider when doing delta compression]: :__git_guard_number "number of objects"' \
+    '--depth=-[maximum delta depth]: :__git_guard_number "maximum delta depth"' \
+    '--window-memory=-[scale window size dynamically to not use more than N bytes of memory]: :__git_guard_bytes' \
+    '--max-pack-size=-[maximum size of each output packfile]:maximum pack size:__git_guard_bytes' && ret=0
 }
 
-(( $+functions[_git-check-ref-format] )) ||
-_git-check-ref-format () {
-  _arguments \
-    ':reference:__git_revisions' && ret=0
+(( $+functions[_git-replace] )) ||
+_git-replace () {
+  _arguments -w -S -s \
+    '(- *)-f[overwrite existing replace ref]' \
+    '(- 2)-d[delete existing replace refs]' \
+    '(- : *)-l[list replace refs]:pattern' \
+    ': :__git_objects' \
+    ':replacement:__git_objects' \
+    '*: :__git_objects' && ret=0
 }
 
+# Ancillary Commands (Interrogators)
+
+(( $+functions[_git-blame] )) ||
+_git-blame () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  declare -a revision_options
+  __git_setup_revision_options
+
+  # TODO: Not sure about __git_cached_files.
+  _arguments -w -C -S -s \
+    '-b[show blank SHA-1 for boundary commits]' \
+    '--root[do not treat root commits as boundaries]' \
+    '--show-stats[include additional statistics at the end of blame output]' \
+    '-L[annotate only the given line range]: :->line-range' \
+    '-l[show long rev]' \
+    '-t[show raw timestamp]' \
+    '-S[use revs from revs-file]:revs-file:_files' \
+    '--reverse[walk histor forward instead of backward]' \
+    '(-p --porcelain)'{-p,--porcelain}'[show results designed for machine processing]' \
+    '--incremental[show results incrementally for machine processing]' \
+    '--contents[annotate against the given file if no rev is specified]: :_files' \
+    '(-h --help)'{-h,--help}'[show help message]' \
+    '-c[use same output format as git annotate]' \
+    '--score-debug[output debugging information relating to -C and -M line movement]' \
+    '(-f --show-name)'{-f,--show-name}'[show the filename of the original commit]' \
+    '(-n --show-number)'{-n,--show-number}'[show the line number in the original commit]' \
+    '-s[suppress author name and timestamp]' \
+    '-w[ignore whitespace when finding lines]' \
+    $revision_options \
+    ': :__git_cached_files' \
+    ':: :__git_revisions' && ret=0
+
+  case $state in
+    (line-range)
+      if compset -P '([[:digit:]]#|/[^/]#(\\?[^/]#)#/),'; then
+        _alternative \
+          'line-numbers::__git_guard_number "line number"' \
+          'regexes::_guard "(/[^/]#(\\?[^/]#)#(/|)|)" regex' \
+          'offsets::_guard "([+-][[:digit:]]#|)" "line offset"' && ret=0
+      else
+        _alternative \
+          'line-numbers::__git_guard_number "line number"' \
+          'regexes::_guard "(/[^/]#(\\?[^/]#)#(/|)|)" regex' && ret=0
+      fi
+      ;;
+  esac
+}
 
 (( $+functions[_git-cherry] )) ||
 _git-cherry () {
+  # TODO: --abbrev is undocumented.
   _arguments \
-    $verbose_arg \
-    ':upstream:__git_revisions' \
-    '::head:__git_revisions' \
-    '::limit:__git_revisions' && ret=0
+    '(-v --verbose)'{-v,--verbose}'[output additional information]' \
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+    ':upstream commit:__git_commits' \
+    '::head commit:__git_commits' \
+    '::limit commit:__git_commits' && ret=0
 }
 
 (( $+functions[_git-count-objects] )) ||
 _git-count-objects () {
   _arguments \
-    '-v[also report number of in-pack objects and objects that can be removed]' && ret=0
+    '(-v --verbose)'{-v,--verbose}'[also report number of in-pack objects and objects that can be removed]' && ret=0
 }
 
-# TODO: do better than _directories?  The directory needs to be a git-repository,
-# so one could check for a required file in the given directory.
-# TODO: --interpolated-path should complete %H, %CH, %IP, %P, and %D.
-(( $+functions[_git-daemon] )) ||
-_git-daemon () {
-  _arguments -S \
-    '--strict-paths[match paths exactly]' \
-    '--base-path=-[remap all the path requests as relative to the given path]:path:_directories' \
-    '--interpolated-path=-[dynamically construct alternate paths]:path:_directories' \
-    '--export-all[allow pulling from all repositories without verification]' \
-    '(--port --listen --user --group)--inetd[run server as an inetd service]' \
-    '(--inetd)--listen=-[listen on a specific IP address or hostname]:hostname:_hosts' \
-    '(--inetd)--port=-[specify port to listen to]:port:_ports' \
-    '--init-timeout=-[specify timeout between connection and request]: :_guard "[[\:digit\:]]#" timeout' \
-    '--timeout=-[specify timeout for sub-requests]: :_guard "[[\:digit\:]]#" timeout' \
-    '--syslog[log to syslog instead of stderr]' \
-    '--user-path=-[allow ~user notation to be used in requests]::path:_directories' \
-    '--verbose[log details about incoming connections and requested files]' \
-    '--reuseaddr[reuse addresses when already bound]' \
-    '(--syslog)--detach[detach from the shell]' \
-    '--pid-file=-[save the process id in given file]:pid file:_files' \
-    '--user=-[set uid of daemon]:user:_users' \
-    '--group=-[set gid of daemon]:group:_groups' \
-    '--enable=-[enable site-wide service]:service:__git_daemon_service' \
-    '--disable=-[disable site-wide service]:service:__git_daemon_service' \
-    '--allow-override[allow overriding site-wide service]:service:__git_daemon_service' \
-    '--forbid-override[forbid overriding site-wide service]:service:__git_daemon_service' \
-    '*:repository:_directories' && ret=0
+(( $+functions[_git-difftool] )) ||
+_git-difftool () {
+  # TODO: Is this fine, or do we need to modify the context or similar?
+  _git-diff \
+    '(-y --no-prompt --prompt)'{-y,--no-prompt}'[do not prompt before invocation of diff tool]' \
+    '(-y --no-prompt)--prompt[prompt before invocation of diff tool]' \
+    '(-t --tool -x --extcmd)'{-t,--tool=-}'[merge resolution program to use]: :__git_difftools' \
+    '(-t --tool -x --extcmd)'{-x,--extcmd=-}'[custom diff command to use]: :_path_commands' \
+    '(-g --gui)'{-g,--gui}'[use diff.guitool instead of diff.tool]'
+}
+
+(( $+functions[_git-fsck] )) ||
+_git-fsck () {
+  # TODO: -v is undocumented.
+  _arguments -w -S -s \
+    '--unreachable[show objects that are unreferenced in the object database]' \
+    '--root[show root nodes]' \
+    '--tags[show tags]' \
+    '--cache[consider objects recorded in the index as head nodes for reachability traces]' \
+    '--no-reflogs[do not consider commits referenced only by reflog entries to be reachable]' \
+    '--full[check all object directories]' \
+    '--strict[do strict checking]' \
+    '(-v --verbose)'{-v,--verbose}'[output additional information]' \
+    '--lost-found[write dangling objects into .git/lost-found]' \
+    '*: :__git_objects' && ret=0
 }
 
 (( $+functions[_git-get-tar-commit-id] )) ||
@@ -2434,313 +2842,579 @@ _git-get-tar-commit-id () {
   _message 'no arguments allowed; accepts tar-file on standard input'
 }
 
+(( $+functions[_git-help] )) ||
+_git-help () {
+  _arguments -w -S -s \
+    '(         -i --info -m --man -w --web)'{-a,--all}'[show all available commands]' \
+    '(-a --all           -m --man -w --web)'{-i,--info}'[show all available commands]' \
+    '(-a --all -i --info          -w --web)'{-m,--man}'[show all available commands]' \
+    '(-a --all -i --info -m --man         )'{-w,--web}'[show all available commands]' \
+    ': :__git_aliases_and_commands' && ret=0
+}
+
 (( $+functions[_git-instaweb] )) ||
 _git-instaweb () {
-  _arguments \
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -S -s \
     '(-l --local)'{-l,--local}'[bind the web server to 127.0.0.1]' \
     '(-d --httpd)'{-d,--httpd=}'[HTTP-daemon command-line that will be executed]:command line' \
     '(-m --module-path)'{-m,--module-path=}'[module path for the Apache HTTP-daemon]:module path:_directories' \
-    '(-p --port)'{-p,--port=}'[port to bind web server to]: :_guard "[[\:digit\:]]" port' \
+    '(-p --port)'{-p,--port=}'[port to bind web server to]: :__git_guard_number port' \
     '(-b --browser)'{-b,--browser=}'[web-browser command-line that will be executed]:command line' \
-    '--start[start the HTTP-daemon and exit]' \
-    '--stop[start the HTTP-daemon and exit]' \
-    '--restart[restart the HTTP-daemon and exit]' && ret=0
+    '(:)--start[start the HTTP-daemon and exit]' \
+    '(:)--stop[stop the HTTP-daemon and exit]' \
+    '(:)--restart[restart the HTTP-daemon and exit]' \
+    ': :->command' && ret=0
+
+  case $state in
+    (command)
+      declare -a commands
+
+      commands=(
+        start:'start the HTTP-daemon and exit'
+        stop:'stop the HTTP-daemon and exit'
+        restart:'restart the HTTP-daemon and exit')
+
+      _describe -t commands command commands && ret=0
+      ;;
+  esac
 }
 
-(( $+functions[_git-mailinfo] )) ||
-_git-mailinfo () {
+(( $+functions[_git-merge-tree] )) ||
+_git-merge-tree () {
   _arguments \
-    '-k[do not strip/add \[PATCH\] from the first line of the commit message]' \
-    '(-u --encoding)-u[encode commit information in UTF-8]' \
-    '(-u --encoding)--encoding[encode commit information in given encoding]:encoding:__git_encodings' \
-    ':message file:_files' \
-    ':patch file:_files' && ret=0
+    ':base-tree:__git_tree_ishs' \
+    ':branch 1:__git_tree_ishs' \
+    ':branch 2:__git_tree_ishs' && ret=0
 }
 
-# TODO:
-# /* Backwards compatibility: if no -o specified, accept
-#    <mbox> <dir> or just <dir> */
-(( $+functions[_git-mailsplit] )) ||
-_git-mailsplit () {
-  _arguments -S \
-    '-b[if file does not begin with "From " line, assume it is a single mail message]' \
-    '-d-[specify number of leading zeros]: :_guard "[[\:digit\:]]#" precision' \
-    '-f-[skip the first N numbers]: :_guard "[[\:digit\:]]#" number' \
-    '-o-[directory in which to place individual messages]:directory:_directories' \
-    '*::mbox file:_files' && ret=0
+(( $+functions[_git-rerere] )) ||
+_git-rerere () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  # TODO: --rerere-autoupdate is undocumented.
+  _arguments -w -C -S -s \
+    '--rerere-autoupdate[register clean resolutions in index]' \
+    ': :->command' && ret=0
+
+  case $state in
+    (command)
+      # TODO: This isn’t optimal, as forget get confused.
+      _values command \
+        'clear[reset metadata used by rerere]' \
+        'forget[resets metadata used by rerere for specific conflict]: :__git_cached_files' \
+        'diff[output diffs for the current state of the resolution]' \
+        'status[like diff, but only output filesames]' \
+        'gc[prune old records of conflicted merges]' && ret=0
+      ;;
+  esac
 }
 
-(( $+functions[_git-patch-id] )) ||
-_git-patch-id () {
-  _message 'no arguments allowed; accepts patch on standard input'
+(( $+functions[_git-rev-parse] )) ||
+_git-rev-parse () {
+  local parseopt_opt= sq_quote_opt= local_env_vars_opt= h_opt=
+  declare -a quiet_opts
+  if (( CURRENT == 2 )); then
+    parseopt_opt='--parseopt[use git rev-parse in option parsing mode]'
+    sq_quote_opt='--sq-quote[use git rev-parse in shell quoting mode]'
+    local_env_vars_opt='--local-env-vars[list git environment variables local to repository]'
+    h_opt='-h[display usage]'
+  fi
+
+  if (( words[(I)--verify] )); then
+    quiet_opts=({-q,--quiet}'[do not output error messages]')
+  fi
+
+  if (( words[(I)--parseopt] )); then
+    if (( words[(I)--] )); then
+      _message 'argument'
+    else
+      # TODO: Parse option specification?
+      _arguments -w -S -s \
+        '(- *)'{-h,--help}'[display usage]'
+        '--keep-dashdash[do not skip first -- option]' \
+        '--stop-at-non-option[stop parsing options at first non-option argument]' \
+        '*:option specification' && ret=0
+    fi
+  elif (( words[(I)--sq-quote] )); then
+    _message 'argument'
+  elif (( words[(I)--local-env-vars|-h] )); then
+    _message 'no more arguments'
+  else
+    _arguments \
+      $parseopt_opt \
+      $sq_quote_opt \
+      $local_env_vars_opt \
+      $h_opt \
+      '(            --no-revs --verify --short)--revs-only[do not output flags and parameters not meant for git rev-list]' \
+      '(--revs-only           --verify --short)--no-revs[do not output flags and parameters meant for git rev-list]' \
+      '(        --no-flags --verify --short)--flags[do not output non-flag parameters]' \
+      '(--flags            --verify --short)--no-flags[do not output flag parameters]' \
+      '--default[use given argument if there is no parameter given]:argument' \
+      '(--revs-only --no-revs --flags --no-flags --short)--verify[verify parameter to be usable]' \
+      '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+      '--sq[output single shell-quoted line]' \
+      '--not[toggle ^ prefix of object names]' \
+      '(           --symbolic-full-name)--symbolic[output in a format as true to input as possible]' \
+      '(--symbolic                     )--symbolic-full-name[same as --symbolic, but omit non-ref inputs]' \
+      '--abbrev-ref=-[a non-ambiguous short name of object]::mode:(strict loose)' \
+      '--all[show all refs found in refs/]' \
+      '--branches=-[show branch refs found in refs/heads/]::shell glob pattern' \
+      '--tags=-[show tag refs found in refs/tags/]::shell glob pattern' \
+      '--remotes=-[show tag refs found in refs/remotes/]::shell glob pattern' \
+      '--glob=-[show all matching refs]::shell glob pattern' \
+      '--show-toplevel[show absolute path of top-level directory]' \
+      '--show-prefix[show path of current directory relative to top-level directory]' \
+      '--show-cdup[show path of top-level directory relative to current directory]' \
+      '--git-dir[show $GIT_DIR if defined else show path to .git directory]' \
+      '--is-inside-git-dir[show whether or not current working directory is below repository directory]' \
+      '--is-inside-work-tree[show whether or not current working directory is inside work tree]' \
+      '--is-bare-repository[show whether or not repository is bare]' \
+      '(--revs-only --no-revs --flags --no-flags --verify)--short=-[show only shorter unique name]:: :__git_guard_number length' \
+      '(--since --after)'{--since=-,--after=-}'[show --max-age= parameter corresponding given date string]:datestring' \
+      '(--until --before)'{--until=-,--before=-}'[show --min-age= parameter corresponding given date string]:datestring' \
+      '*: :__git_objects' && ret=0
+  fi
 }
 
-(( $+functions[_git-request-pull] )) ||
-_git-request-pull () {
+(( $+functions[_git-show-branch] )) ||
+_git-show-branch () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -w -C -S -s -A '-*' \
+    '(--more        --merge-base --independent)--list[do not show any ancestry (--more=-1)]' \
+    - branches \
+      '(-r --remotes -a --all)'{-r,--remotes}'[show remote-tracking branches]' \
+      '(-r --remotes -a --all)'{-a,--all}'[show both remote-tracking branches and local branches]' \
+      '--current[include current branch to the list of revs]' \
+      '(             --date-order)--topo-order[show commits in topological order]' \
+      '(--topo-order             )--date-order[show commits in commit-date order]' \
+      '--sparse[output merges that are reachable from multiple tips being shown]' \
+      '(       --list --merge-base --independent)--more=[go given number of commit beyond common ancestor (no ancestry if negative)]:: :_guard "(-|)[[\:digit\:]]#" limit' \
+      '(--more --list              --independent)--merge-base[act like git merge-base -a, but with two heads]' \
+      '(--more --list --merge-base              )--independent[show only the reference that can not be reached from any of the other]' \
+      '(          --sha1-name)--no-name[do not show naming strings for each commit]' \
+      '(--no-name            )--sha1-name[name commits with unique prefix of object names]' \
+      '--topics[show only commits that are NOT on the first branch given]' \
+      '(        --no-color)--color[color status sign of commits]:: :__git_color_whens' \
+      '(--color           )--no-color[do not color statis sign of commits]' \
+      '*: :__git_revisions' \
+    - reflogs \
+      '(-g --reflog)'{-g,--reflog=}'[show reflog entries for given ref]:: :->limit-and-base' \
+      ': :__git_references' && ret=0
+
+  case $state in
+    (limit-and-base)
+      if compset -P '[[:digit:]]##,'; then
+        _alternative \
+          'counts::__git_guard_number count' \
+          'dates::__git_datetimes' && ret=0
+      else
+        __git_guard_number limit
+      fi
+      ;;
+  esac
+}
+
+(( $+functions[_git-verify-tag] )) ||
+_git-verify-tag () {
+  # TODO: -v and --verbose are undocumented.
+  _arguments -w -S -s \
+    '(-v --verbose)'{-v,--verbose}'[output additional information]' \
+    '*: :__git_tags' && ret=0
+}
+
+(( $+functions[_git-whatchanged] )) ||
+_git-whatchanged () {
+  local -a revision_options
+  __git_setup_revision_options
+
+  _arguments -S \
+    $revision_options \
+    '1:: :__git_commits' \
+    '*: :__git_cached_files' && ret=0
+}
+
+# Interacting With Others
+
+(( $+functions[_git-archimport] )) ||
+_git-archimport () {
+  # TODO: archive/branch can perhaps use _arch_archives.  It should also allow
+  # an optional colon followed by a __git_branches.
   _arguments \
-    ':start commit:__git_commits' \
-    ':url:_urls' \
-    '::end commit:__git_commits'
+    '-h[display usage]' \
+    '-v[verbose output]' \
+    '-T[create tag for every commit]' \
+    '-f[use fast patchset import strategy]' \
+    '-o[use old-style branch names]' \
+    '-D[attempt to import trees that have been merged from]: :__git_guard_number depth' \
+    '-a[auto-register archives at http://mirrors.sourcecontrol.net]' \
+    '-t[use given directory as temporary directory]: :_directories' \
+    '*:archive/branch' && ret=0
 }
 
-(( $+functions[_git-rev-parse] )) ||
-_git-rev-parse () {
+(( $+functions[_git-cvsexportcommit] )) ||
+_git-cvsexportcommit () {
+  # TODO: Could use _cvs_root from _cvs for completing argument to -d.
   _arguments \
-    '(--revs-only --no-revs)--revs-only[do not output flags and parameters not meant for "git-rev-list"]' \
-    '(--revs-only --no-revs)--no-revs[do not output flags and parameters meant for "git-rev-list"]' \
-    '(--flags --no-flags)--flags[do not output non-flag parameters]' \
-    '(--flags --no-flags)--no-flags[do not output flag parameters]' \
-    '--default[use "arg" if there is no parameter given]:arg' \
-    '--verify[verify parameter to be usable]' \
-    '--sq[output single shell-quoted line]' \
-    '--not[toggle ^ prefix of object names]' \
-    '--symbolic[output in a format as true to input as possible]' \
-    '--all[show all refs found in $GIT_DIR/refs]' \
-    '--branches[show branch refs found in $GIT_DIR/refs/heads]' \
-    '--tags[show tag refs found in $GIT_DIR/refs/tags]' \
-    '--remotes[show tag refs found in $GIT_DIR/refs/remotes]' \
-    '--show-prefix[show path of current directory relative to top-level directory]' \
-    '--show-cdup[show path of top-level directory relative to current directory]' \
-    '--git-dir[show "$GIT_DIR" if defined else show path to ".git" directory]' \
-    '--short=-[show only handful hexdigits prefix]:: :_guard "[[\:digit\:]]#" number' \
-    {--after=-,--since=-}'[show "--max-age=" parameter corresponding given date string]:datestring' \
-    {--before=-,--until=-}'[show "--min-age=" parameter corresponding given date string]:datestring' \
-    '*:objects:__git_objects' && ret=0
-}
-
-(( $+functions[_git-runstatus] )) ||
-_git-runstatus () {
+    '-c[commit automatically if patch applied cleanly]' \
+    '-p[be pedantic (paranoid) when applying patches]' \
+    '-a[add authorship information]' \
+    '-d[set an alternative CVSROOT to use]:cvsroot' \
+    '-f[force the merge, even if files are not up to date]' \
+    '-P[force the parent commit, even if it is not a direct parent]' \
+    '-m[prepend the commit message with the provided prefix]:message prefix' \
+    '-u[update affected files from CVS repository before attempting export]' \
+    '-k[reverse CVS keyword expansion]' \
+    '-w[specify location of cVS checkout to use for export]' \
+    '-W[use current working directory for bot Git and CVS checkout]' \
+    '-v[verbose output]' \
+    '-h[display usage]' \
+    ':: :__git_commits' \
+    ': :__git_commits' && ret=0
+}
+
+(( $+functions[_git-cvsimport] )) ||
+_git-cvsimport () {
+  # TODO: _cvs_root for -d would be nice
   _arguments \
-    '--color[show colored status, highlighting modified files]' \
-    '--nocolor[turn of colored output]' \
-    '--amend[show status based on HEAD^1 instead of HEAD]' \
-    '--verbose[show unified diff of all file changes]' \
-    '--untracked[show files in untracked directories]' && ret=0
+    '-v[verbose output]' \
+    '-d[specify the root of the CVS archive]:cvsroot' \
+    '-C[specify the git repository to import into]:directory:_directories' \
+    '-r[the git remote to import into]:remote' \
+    '-o[specify the branch into which you wish to import]: :__git_branch_names' \
+    '-i[do not perform a checkout after importing]' \
+    '-k[remove keywords from source files in the CVS archive]' \
+    '-u[convert underscores in tag and branch names to dots]' \
+    '-s[substitute the "/" character in branch names with given substitution]:substitute' \
+    '-p[specify additional options for cvsps]:cvsps-options' \
+    '-z[specify timestamp fuzz factor to cvsps]:fuzz-factor' \
+    '-P[read cvsps output file]:file:_files' \
+    '-m[attempt to detect merges based on the commit message]' \
+    '*-M[attempt to detect merges based on the commit message with custom pattern]:pattern' \
+    '-S[skip paths matching given regex]:regex' \
+    '-a[import all commits, including recent ones]' \
+    '-L[limit the number of commits imported]:limit' \
+    '-A[specify author-conversion file]:author-conversion file:_files' \
+    '-R[generate cvs-revisions file mapping CVS revision numbers to commit IDs]' \
+    '-h[display usage information]' \
+    ':cvsmodule' && ret=0
 }
 
-(( $+functions[_git-rm] )) ||
-_git-rm () {
-  _arguments -S -A '-*' \
-    '-f[override the up-to-date check]' \
-    '-n[don'\''t actually remove the files, just show if they exist in the index]' \
-    '-r[allow recursive removal when a leading directory-name is given]' \
-    '--cached[only remove files from the index]' \
-    '--ignore-unmatch[exit with 0 status even if no files matched]' \
-    '(-q --quiet)'{-q,--quiet}'[do not output files deleted]' \
-    '*:files:__git_cached_files' && ret=0
+(( $+functions[_git-cvsserver] )) ||
+_git-cvsserver () {
+  _arguments -w -S -s \
+    '--base-path[path to prepend to requested CVSROOT]: :_directories' \
+    '--strict-paths[do not allow recursing into subdirectories]' \
+    '--export-all[do not check for gitcvs.enabled]' \
+    '(- * -V --version)'{-V,--version}'[display version information]' \
+    '(- * -h --help)'{-h,-H,--help}'[display usage information]' \
+    '::type:(pserver server)' \
+    '*: :_directories' && ret=0
+}
+
+(( $+functions[_git-imap-send] )) ||
+_git-imap-send () {
+  _message 'no arguments allowed; accepts mailbox file on standard input'
+}
+
+(( $+functions[_git-quiltimport] )) ||
+_git-quiltimport () {
+  _arguments -S \
+    '(-n --dry-run)'{-n,--dry-run}'[check patches and warn if they cannot be imported]' \
+    '--author[default author name and email address to use for patches]: :_email_addresses' \
+    '--patches[set directory containing patches]:patch directory:_directories' && ret=0
+}
+
+(( $+functions[_git-request-pull] )) ||
+_git-request-pull () {
+  _arguments -S \
+    '-p[display patch text]' \
+    ':start commit:__git_commits' \
+    ': :_urls' \
+    '::end commit:__git_commits'
 }
 
 (( $+functions[_git-send-email] )) ||
 _git-send-email () {
-  _arguments \
-    '--bcc=["Bcc:" value for each email]:email address:_email_addresses' \
-    '--cc=[starting "Cc:" value for each email]:email address:_email_addresses' \
-    '(--no-chain-reply-to)--chain-reply-to[each email will be sent as a reply to the previous one sent]' \
-    '(--chain-reply-to)--no-chain-reply-to[all emails after the first will be sent as replies to the first one]' \
-    '--compose[use $EDITOR to edit an introductory message for the patch series]' \
-    '--from=[specify the sender of the emails]:email address:_email_addresses' \
-    '--in-reply-to=[specify the contents of the first In-Reply-To header]:message-id' \
-    '--no-signed-off-by-cc[do not add emails foudn in "Signed-off-by:" lines to the "Cc:" list]' \
-    '--quiet[be less verbose]' \
-    '--smtp-server=[specify the outgoing smtp server]:smtp server:_hosts' \
+  _arguments -S \
+    '--annotate[review and edit each patch before sending it]' \
+    '--bcc=[Bcc: value for each email]: :_email_addresses' \
+    '--cc=[starting Cc: value for each email]: :_email_addresses' \
+    '--compose[edit introductory message for patch series]' \
+    '--from=[specify sender]:email address:_email_addresses' \
+    '--in-reply-to=[specify contents of first In-Reply-To header]:message-id' \
     '--subject=[specify the initial subject of the email thread]:subject' \
-    '--suppress-from[do not add the "From:" address to the "Cc:" list]' \
-    '--dry-run[do everything except actually send the emails]' \
-    '--envelope-sender[specify the envelope sender used to send the emails]:email address:_email_addresses' \
-    '--to=[specify the primary recipient of the emails]:email address:_email_addresses' \
-    '*:file:_files' && ret=0
-}
-
-# TODO: --minimize-connections is undocumented.
-# TODO: --remote is undocumented.
-# TODO: --log-window-size is undocumented.
-# TODO: --config-dir is undocumented.
-# TODO: --no-auth-cache is undocumented.
-# TODO: -C and --copy-similarity are undocumented.
-# TODO: --fetch-all and --all are undocumented.
-# TODO: -v and --verbose are undocumented.
-# TODO: -r and --revisions for show-ignore are undocumented.
-# TODO: migrate is undocumented.
-# TODO: --minimize for migrate is undocumented.
-# TODO: -r, --color, --pager, and --non-recursive for log are undocumented.
-# TODO: --message, -m, --file, -F, --revision, and -r for commit-diff are
-# undocumented.
+    '--to=[specify the primary recipient of the emails]: :_email_addresses' \
+    '--8bit-encoding=[encoding to use for non-ASCII messages]: :__git_encodings' \
+    '--envelope-sender[specify the envelope sender used to send the emails]: :_email_addresses' \
+    '--smtp-encryption=[specify encryption method to use]: :__git_sendemail_smtpencryption_values' \
+    '--smtp-domain=[specify FQDN used in HELO/EHLO]: :_domains' \
+    '--smtp-pass=[specify password to use for SMTP-AUTH]::password' \
+    '--smtp-server=[specify SMTP server to connect to]:smtp server:_hosts' \
+    '--smtp-server-port=[specify port to connect to SMTP server on]:smtp port:_ports' \
+    '--smtp-user=[specify user to use for SMTP-AUTH:smtp user:_users' \
+    '--cc-cmd=[specify command to generate Cc\: header with]:Cc\: command:_path_commands' \
+    '(                 --no-chain-reply-to)--chain-reply-to[send each email as a reply to previous one]' \
+    '(--chain-reply-to                    )--no-chain-reply-to[send all emails after first as replies to first one]' \
+    '--identity=[specify configuration identity]: :__git_sendemail_identities' \
+    '(                   --no-signed-off-by-cc)--signed-off-by-cc[add emails found in Signed-off-by: lines to the Cc: list]' \
+    '(--signed-off-by-cc                      )--no-signed-off-by-cc[do not add emails found in Signed-off-by: lines to the Cc: list]' \
+    '--suppress-cc=[specify rules for suppressing Cc:]: :__git_sendemail_suppresscc_values' \
+    '(                --no-suppress-from)--suppress-from[do not add the From: address to the Cc: list]' \
+    '(--suppress-from                   )--no-suppress-from[add the From: address to the Cc: list]' \
+    '(         --no-thread)--thread[set In-Reply-To: and References: headers]' \
+    '(--thread            )--no-thread[do not set In-Reply-To: and References: headers]' \
+    '--confirm[specify type of confirmation required before sending]: :__git_sendemail_confirm' \
+    '--dry-run[do everything except actually sending the emails]' \
+    '(               --no-format-patch)--format-patch[interpret ambiguous arguments as format-patch arguments]' \
+    '(--format-patch                  )--no-format-patch[interpret ambiguous arguments file-name arguments]' \
+    '--quiet[be less verbose]' \
+    '(           --no-validate)--validate[perform sanity checks on patches]' \
+    '(--validate              )--validate[do not perform sanity checks on patches]' \
+    '--force[send emails even if safetiy checks would prevent it]' \
+    '*: :_files' && ret=0
+}
+
 (( $+functions[_git-svn] )) ||
 _git-svn () {
   local curcontext=$curcontext state line
   declare -A opt_args
 
   _arguments -C \
-    '(- :)--version[display version information]' \
-    '(- :)--help[display help message]' \
-    ':command:->command' \
-    '*::options:->options' && ret=0
+    '(- :)'{-V,--version}'[display version information]' \
+    '(- :)'{-h,-H,--help}'[display usage information]' \
+    ': :->command' \
+    '*:: :->option-or-argument' && ret=0
 
   case $state in
     (command)
       declare -a commands
 
       commands=(
-        'init:initialize an empty git repository with additional svn data'
-        'fetch:fetch revisions from the SVN remote'
-        'clone:same as init, followed by fetch'
-        'rebase:fetch revs from SVN parent of HEAD and rebase current work on it'
-        'dcommit:commit diffs from given head onto SVN repository'
-        'branch:create a branch in the SVN repository'
-        'tag:create a tag in the SVN repository'
-        'log:output SVN log-messages'
-        'blame:show what revision and author last modified each line of a file:'
-        'find-rev:output git commit corresponding to the given SVN revision'\''s hash'
-        'set-tree:commit given commit or tree to SVN repository'
-        'create-ignore:recursively finds the svn:ignore property and creates .gitignore files'
-        'show-ignore:output corresponding toplevel .gitignore file of svn:ignore'
-        'commit-diff:commit diff of two tree-ishs'
-        'info:show information about a file or directory'
-        'proplist:list the SVN properties stored for a file or directory'
-        'propget:get a given SVN property for a file'
-        'show-externals:show the subversion externals')
-        _describe -t commands command commands && ret=0
+        init:'initialize an empty git repository with additional svn data'
+        fetch:'fetch revisions from the SVN remote'
+        clone:'same as init, followed by fetch'
+        rebase:'fetch revs from SVN parent of HEAD and rebase current work on it'
+        dcommit:'commit diffs from given head onto SVN repository'
+        branch:'create a branch in the SVN repository'
+        tag:'create a tag in the SVN repository'
+        log:'output SVN log-messages'
+        blame:'show what revision and author last modified each line of a file'
+        find-rev:'output git commit corresponding to the given SVN revision'\''s hash'
+        set-tree:'commit given commit or tree to SVN repository'
+        create-ignore:'recursively finds the svn:ignore property and creates .gitignore files'
+        show-ignore:'output corresponding toplevel .gitignore file of svn:ignore'
+        mkdirs:'recreate empty directories that Git cannot track'
+        commit-diff:'commit diff of two tree-ishs'
+        info:'show information about a file or directory'
+        proplist:'list the SVN properties stored for a file or directory'
+        propget:'get a given SVN property for a file'
+        show-externals:'show the subversion externals'
+        gc:'compress git-svn-related information'
+        reset:'undo effect of fetch back to specific revision')
+
+      _describe -t commands command commands && ret=0
       ;;
-    (options)
-      declare -a arguments
+    (option-or-argument)
+      curcontext=${curcontext%:*}-$line[1]:
 
-      if [[ $line[1] == (fetch|clone|dcommit|set-tree|rebase|migrate|init) ]]; then
-        arguments+=(
-          '--username=[username to use for SVN transport]:username:_users'
-          '--config-dir=[undocumented]:configuration directory:_directories'
-          '--no-auth-cache[undocumented]')
-      fi
+      declare -a remote_opts fc_opts init_opts cmt_opts opts
 
-      if [[ $line[1] == (fetch|clone|dcommit|set-tree|rebase|log) ]]; then
-        arguments+=(
-          '(   --authors-file)'$author_conversion_file_arg
-          '(-A               )'$long_author_conversion_file_arg)
-      fi
+      # TODO: --no-auth-cache is undocumented.
+      # TODO: --config-dir is undocumented.
+      remote_opts=(
+          '--username=[username to use for SVN transport]: :_users'
+          '--ignore-paths[regular expression of paths to not check out]:pattern'
+          '--no-auth-cache[undocumented]'
+          '--config-dir=[undocumented]:configuration directory:_directories')
 
       # TODO: --repack-flags can be improved by actually completing the legal
       # flags to git-repack.
-      if [[ $line[1] == (fetch|clone|dcommit|set-tree|rebase) ]]; then
-        arguments+=(
-          '(-q --quiet)'{-q,--quiet}'[make git-svn less verbose]'
-          '--repack=[repack files (for given number of revisions)]:: :_guard "[[\:digit\:]]#" "revision limit"'
-          '(--repack-flags --repack-args --repack-opts)'{--repack-flags=,--repack-args=,--repack-opts=}'[flags to pass to git-repack]:git-repack flags'
-          '(                --no-follow-parent)--follow-parent[follow parent commit]'
-          '(--follow-parent                   )--no-follow-parent[do not follow parent commit]'
-          '--log-window-size=[undocumented]')
-      fi
-
-      if [[ $line[1] == (clone|init) ]]; then
-        arguments+=(
-          $shared_arg
-          $template_arg
+      # TODO: --noMetadata is undocumented.
+      # TODO: --useSvmProps is undocumented.
+      # TODO: --useSvnsyncProps is undocumented.
+      # TODO: --log-window-size is undocumented.
+      # TODO: --no-checkout is undocumented.
+      fc_opts=(
+        '--localtime[store Git commit times in local timezone]'
+        '--use-log-author[use author from the first From: or Signed-Off-By: line, when fetching into git]'
+        '--add-author-from[when committing to svn, append a From: line based on the git commit'\''s author string]'
+        '(                --no-follow-parent)--follow-parent[follow parent commit]'
+        '(--follow-parent                   )--no-follow-parent[do not follow parent commit]'
+        '(-A --authors-file)'{-A,--authors-file}'[specify author-conversion file]:author-conversion file:_files'
+        '--authors-prog=[program used to generate authors]: :_path_commands'
+        '(-q --quiet)'{-q,--quiet}'[make git-svn less verbose]'
+        '--repack=[repack files (for given number of revisions)]:: :__git_guard_number "revision limit"'
+        '(--repack-flags --repack-args --repack-opts)'{--repack-flags=,--repack-args=,--repack-opts=}'[flags to pass to git-repack]:git-repack flags'
+        '--noMetadata[undocumented]'
+        '--useSvmProps[undocumented]'
+        '--useSvnsyncProps[undocumented]'
+        '--log-window-size=[undocumented]'
+        '--no-checkout[undocumented]'
+        $remote_opts)
+
+      init_opts=(
           '(-T --trunk)'{-T-,--trunk=}'[set trunk sub-directory]:trunk sub-directory:->subdirectory'
-          '(-t --tags)'{-t-,--tags=}'[set tags sub-directory]:tags sub-directory:->subdirectory'
-          '(-b --branches)'{-b-,--branches=}'[set branches sub-directory]:branches sub-directory:->subdirectory'
-          '--stdlayout[shorthand for setting trunk,tags,branches as relative paths, the SVN default]'
-          '--no-metadata[set svn-remote.X.noMetadata]'
-          '--use-svm-props[set svn-remote.X.useSvmProps]'
-          '--use-svnsync-props[set svn-remote.X.useSvnsyncProps]'
-          '--rewrite-root=[set svn-remote.X.rewriteRoot]:new root'
-          '--use-log-author[use author from the first From: or Signed-Off-By: line, when fetching into git]'
-          '--add-author-from[when committing to svn, append a From: line based on the git commit'\''s author string]'
-          '--prefix=[prefix to use for names of remotes]:path prefix:_directories -r ""')
-      fi
-
-      if [[ $line[1] == (dcommit|set-tree|commit-diff) ]]; then
+          '(-t --tags)*'{-t-,--tags=}'[add tags sub-directory]:tags sub-directory:->subdirectory'
+          '(-b --branches)*'{-b-,--branches=}'[add branches sub-directory]:branches sub-directory:->subdirectory'
+          '(-s --stdlayout)'{-s,--stdlayout}'[shorthand for setting trunk, tags, branches as relative paths, the SVN default]'
+          '--no-metadata[set svn-remote.*.noMetadata]'
+          '--use-svm-props[set svn-remote.*.useSvmProps]'
+          '--use-svnsync-props[set svn-remote.*.useSvnsyncProps]'
+          '--rewrite-root=[set svn-remote.*.rewriteRoot]:new root:_urls'
+          '--rewrite-uuid=[set svn-remote.*.rewriteUUID]:uuid'
+          '--prefix=[prefix to use for names of remotes]:path prefix:_directories -r ""'
+          '(               --no-minimize-url)--minimize-url[minimize URLs]'
+          '(--minimize-url                  )--no-minimize-url[do not minimize URLs]'
+          '--shared=[share repository amongst several users]:: :__git_repository_permissions'
+          '--template=[directory to use as a template for the object database]: :_directories'
+          $remote_opts)
+
+      # TODO: -C and --copy-similarity are undocumented.
+      cmt_opts=(
+        '--rmdir[remove empty directories from SVN tree after commit]'
+        '(-e --edit)'{-e,--edit}'[edit commit message before committing]'
+        '-l-[limit number of rename/copy targets to run]: :__git_guard_number'
+        '--find-copies-harder[try harder to find copies]'
+        '(-C --copy-similarity)'{-C-,--copy-similarity=}'[undocumented]: :_guard "[[\:digit:\]]#" number')
+
+      if [[ $line[1] == (fetch|clone) ]]; then
         arguments+=(
-          '--rmdir[remove empty directories from SVN tree after commit]'
-          '(-e --edit)'{-e,--edit}'[edit commit message before committing]'
-          $find_copies_harder_arg
-          $diff_l_arg
-          '(-C --copy-similarity)'{-C-,--copy-similarity=}'[undocumented]:number')
+          '(-r --revision)'{-r,--revision}'[only fetch given revision or revision range]: :__git_svn_revisions'
+          ':: :__git_svn-remotes')
       fi
 
-      if [[ $line[1] == (fetch|clone|log|create-ignore|info|propget|proplist|show-externals) ]]; then
-        arguments+=(
-          '(-r --revision)'{-r,--revision}'[only fetch given revision or revision range]:revision:->__git_svn_revisions'
-          '::svn remote:__git_svn-remotes')
+      if [[ $line[1] == (fetch|rebase|dcommit) ]]; then
+        # TODO: --fetch-all and --all are undocumented.
+        opts+=(
+          '(--fetch-all --all)'{--fetch-all,--all}'[undocumented]')
       fi
 
-      if [[ $line[1] == (dcommit|rebase) ]]; then
-        arguments+=(
+      if [[ $line[1] == (rebase|dcommit) ]]; then
+        opts+=(
           '(-m --merge)'{-m,--merge}'[use merging strategies, if necessary]'
           '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies')
       fi
 
-      if [[ $line[1] == (fetch|dcommit|rebase) ]]; then
-        arguments+=(
-          '(--fetch-all --all)'{--fetch-all,--all}'[undocumented]')
+      if [[ $line[1] == (rebase|dcommit|branch) ]]; then
+        opts+=(
+          '(-n --dry-run)'{-n,--dry-run}'[only display what would be done]')
       fi
 
-      if [[ $line[1] == (dcommit|log|rebase) ]]; then
-        arguments+=(
-          '(-v --verbose)'{-v,--verbose}'[output extra information]')
+      if [[ $line[1] == (rebase|dcommit|log) ]]; then
+        opts+=(
+          '(-v --verbose)'{-v,--verbose}'[display extra information]')
       fi
 
       case $line[1] in
+        (init)
+          opts+=(
+            $init_opts)
+          ;;
+        (fetch)
+          opts+=(
+            '--parent[fetch only from SVN parent of current HEAD]'
+            $fc_opts)
+          ;;
         (clone)
-          arguments+=(
+          opts+=(
+            $init_opts
+            $fc_opts
             ':url:_urls'
             '::directory:_directories')
           ;;
-        (set-tree)
-          arguments+=('--stdin[read list of commits to commit from stdin]')
-          ;;
-        (show-ignore)
-          arguments+=('-r --revision)'{-r,--revision}'[undocumented]:revision:->__git_svn_revisions')
+        (rebase)
+          opts+=(
+            '--local[do not fetch remotely, rebase against the last fetched commit from SVN]'
+            $fc_opts)
           ;;
         (dcommit)
           arguments+=(
-            '(-n --dry-run)'{-n,--dry-run}'[output git-commands that would show diffs that would be committed]'
             '--no-rebase[do not rebase or reset after committing]'
-            '--commit-url[commit to a different SVN url]:SVN URL:_url')
+            '--commit-url[commit to a different SVN url]:SVN URL:_url'
+            $fc_opts
+            $cmt_opts)
           ;;
-        (branch)
-          arguments+=(
+        (branch|tag)
+          # TODO: -d/--destination should complete output of
+          # git config --get-all svn-remote.*.branches
+          # git config --get-all svn-remote.*.tags
+          # TODO: --username should probably use something from _svn.
+          # TODO: --commit-url should complete output of
+          # git config --get-all svn-remote.*.commiturl
+          opts+=(
             '(-m --message)'{-m,--message}'[specify the commit message]:message'
-            '(-t --tag)'{-t,--tag}'[create a tag]')
-          ;;
-        (migrate)
-          arguments+=(
-            '--minimize[undocumented]')
+            '(-d --destination)'{-d,--destination}'[location of branch or tag to create in SVN repository]: :_directories'
+            '--username[specify SVN username to perform commit as]: :_users'
+            '--commit-url[specify URL to connect to destination SVN repository]: :_urls')
+
+          if [[ $line[1] != tag ]]; then
+            opts+=(
+              '(-t --tag)'{-t,--tag}'[create a tag]')
+          fi
           ;;
         (log)
-          __git_setup_revision_arguments
-
-          arguments+=(
-            $revision_arguments
+          declare -a revision_options
+          __git_setup_revision_options
+
+          # TODO: --color is undocumented.
+          # TODO: --pager is undocumented.
+          # TODO: --non-recursive is undocumented.
+          opts+=(
+            $revision_options
             '(-r --revision)'{-r-,--revision=}'[revisions to output log information for]: :__git_svn_revision_numbers'
-            '--limit=[like --max-count, but not counting merged/excluded commits]: :_guard "[[\:digit\:]]#" limit'
+            '--limit=[like --max-count, but not counting merged/excluded commits]: :__git_guard_number limit'
             '--incremental[give output suitable for concatenation]'
             '--show-commit[output git commit SHA-1, as well]'
-            '--oneline[similar to --pretty=oneline]'
             '--color[undocumented]'
-            '--pager[undocumented]:pager:_files -g *(*)'
+            '--pager[undocumented]:pager:_path_commands'
             '--non-recursive[undocumented]')
           ;;
         (blame)
-          arguments+=(
+          opts+=(
             '--git-format[produce output in git-blame format, with SVN revision numbers instead of git commit hashes]')
           ;;
-        (rebase)
-          arguments+=(
-            '--local[do not fetch remotely, rebase against the last fetched commit from SVN]')
+        (set-tree)
+          opts+=(
+            '--stdin[read list of commits to commit from stdin]')
+          ;;
+        (create-ignore|show-ignore|mkdirs|proplist|propget|show-externals)
+          # TODO: -r and --revision is undocumented for show-ignore and mkdirs.
+          opts+=(
+            '(-r --revision)'{-r,--revision}'[specify SVN revision]: :__git_svn_revisions')
           ;;
         (commit-diff)
-          arguments+=(
+          # TODO: -m and --message is undocumented.
+          # TODO: -F and --file is undocumented.
+          # TODO: -r and --revision is undocumented.
+          opts+=(
             '(-m --message)'{-m-,--message=}'[undocumented]:message'
-            '(-F --file)'{-F-,--file=}'[undocumented]:file:_files'
-            '(-r --revision)'{-r-,--revision=}'[undocumented]:revision:__git_svn_revisions')
+            '(-F --file)'{-F-,--file=}'[undocumented]: :_files'
+            '(-r --revision)'{-r-,--revision=}'[undocumented]: :__git_svn_revisions')
+          ;;
+        (info)
+          opts+=(
+            '--url[output only value of URL field]')
+          ;;
+        (reset)
+          opts+=(
+            '(-r --revision)'{-r,--revision}'[specify most recent SVN revision to keep]: :__git_svn_revisions'
+            '(-p --parent)'{-p,--parent}'[discard specified revision as well, keeping nearest parent instead]')
           ;;
       esac
 
-      _arguments -C \
+      _arguments -w -C -S -s \
         '(-h -H --help)'{-h,-H,--help}'[display usage information]' \
         '(-V --version)'{-V,--version}'[display version information]' \
         '--minimize-connections[undocumented]' \
         '(-R --svn-remote --remote)'{-R,--svn-remote,--remote}'[svn remote to use]:svn remote:__git_svn-remotes' \
         '(-i --id)'{-i,--id}'[set GIT_SVN_ID]:GIT_SVN_ID' \
-        $arguments && ret=0
+        $opts && ret=0
 
       case $state in
         (subdirectory)
@@ -2753,368 +3427,1259 @@ _git-svn () {
   esac
 }
 
-(( $+functions[_git-stripspace] )) ||
-_git-stripspace () {
-  _message 'no arguments allowed; accepts input file on standard input'
-}
+# LOW-LEVEL COMMANDS (PLUMBING)
 
-(( $+functions[_git-mergetool] )) ||
-_git-mergetool () {
-  local curcontext=$curcontext state line
-  typeset -A opt_args
+# Manipulation commands
 
-  _arguments -C \
-    '(-t --tool)'{-t,--tool=}':merge resolution tool:(kdiff3 tkdiff meld xxdiff emerge vimdiff gvimdiff opendiff)' \
-    '*:conflicted file:_files' && ret=0
-}
+(( $+functions[_git-apply] )) ||
+_git-apply () {
+  local -a apply_options
+  __git_setup_apply_options
 
-# ---
+  _arguments -w -S -s \
+    $apply_options \
+    '--stat[output diffstat for input (turns off "apply")]' \
+    '--numstat[same as --stat but in decimal notation and complete pathnames (turns off "apply")]' \
+    '--summary[output summary of git-diff extended headers (turns off "apply")]' \
+    '--check[check if patches are applicable (turns off "apply")]' \
+    '(        --cached)--index[make sure that patch is applicable to index]' \
+    '(--index         )--cached[apply patches without touching working tree]' \
+    '--build-face-ancestor[build temporary index for blobs with ambiguous origin]:index:_files' \
+    '(-R --reverse)'{-R,--reverse}'[apply patches in reverse]' \
+    '-z[use NUL termination on output]' \
+    '--unidiff-zero[disable unified-diff-context check]' \
+    '--apply[apply patches that would otherwise not be applied]' \
+    '--no-add[ignore additions made by the patch]' \
+    '*--exclude=[skip files matching specified pattern]:pattern' \
+    '*--include=[include files matching specified pattern]:pattern' \
+    '--inaccurate-eof[work around missing-new-line-at-EOF bugs]' \
+    '(-v --verbose)'{-v,--verbose}'[display progress on stderr]' \
+    '--recount[do not trust line counts in hunk headers]' \
+    '*:patch:_files' && ret=0
+}
 
-(( $+functions[__git_guard] )) ||
-__git_guard () {
-  declare -A opts
+(( $+functions[_git-checkout-index] )) ||
+_git-checkout-index () {
+  local z_opt=
 
-  zparseopts -K -D -A opts M: J: V: 1 2 n F: X:
+  if (( words[(I)--stdin] )); then
+    z_opt='-z[paths are separated with NUL character when reading from standard input]'
+  fi
 
-  [[ "$PREFIX$SUFFIX" != $~1 ]] && return 1
+  _arguments -w -S -s \
+    '(-u --index)'{-u,--index}'[update stat information in index]' \
+    '(-q --quiet)'{-q,--quiet}'[do not complain about existing files or missing files]' \
+    '(-f --force)'{-f,--force}'[force overwrite of existing files]' \
+    '(-a --all --stdin *)'{-a,--all}'[check out all files in index]' \
+    '(-n --no-create)'{-n,--no-create}'[do not checkout new files]' \
+    '--prefix=-[prefix to use when creating files]:directory:_directories' \
+    '--stage=-[check out files from named stage]:stage:(1 2 3 all)' \
+    '--temp[write content to temporary files]' \
+    '(-a --all *)--stdin[read list of paths from the standard input]' \
+    $z_opt \
+    '*: :__git_cached_files' && ret=0
+}
 
-  if (( $+opts[-X] )); then
-    _message -r $opts[-X]
+(( $+functions[_git-commit-tree] )) ||
+_git-commit-tree () {
+  if (( CURRENT == 2 )); then
+    _arguments \
+      '-h[display usage]' \
+      ': :__git_trees' && ret=0
+  elif [[ $words[CURRENT-1] == -p ]]; then
+    local expl
+    _description commits expl 'parent commit'
+    __git_objects $expl && ret=0
   else
-    _message -e $2
+    compadd - '-p'
   fi
+}
 
-  [[ -n "$PREFIX$SUFFIX" ]]
+(( $+functions[_git-hash-object] )) ||
+_git-hash-object () {
+  _arguments -S \
+    '-t[type of object to create]:object type:((blob\:"a blob of data"
+                                                commit\:"a tree with parent commits"
+                                                tag\:"a symbolic name for another object"
+                                                tree\:"a recursive tree of blobs"))' \
+    '-w[write object to object database]' \
+    '(: --stdin-paths)--stdin[read object from standard input]' \
+    '(: --stdin --path)--stdin-paths[read file names from standard input instead of from command line]' \
+    '(       --no-filters)--path=[hash object as if it were located at given path]: :_files' \
+    '(--path             )--no-filters[hash contents as is, ignoring any input filters]' \
+    '(--stdin --stdin-paths):file:_files' && ret=0
 }
 
-__git_guard_branch-name () {
-  if [[ -n "$PREFIX$SUFFIX" ]]; then
-    _call_program check-ref-format git check-ref-format "refs/heads/$PREFIX$SUFFIX" &>/dev/null
-    (( ${#pipestatus:#0} > 0 )) && return 1
+(( $+functions[_git-index-pack] )) ||
+_git-index-pack () {
+  local -a stdin_opts
+
+  if (( words[(I)--stdin] )); then
+    stdin_opts=(
+      '--fix-thin[record deltified objects, based on objects not included]'
+      '--keep=-[create .keep file]::reason')
   fi
 
-  _message -e 'branch-name'
+  # NOTE: --index-version is only used by the Git test suite.
+  # TODO: --pack_header is undocumented.
+  _arguments \
+    '-v[display progress on stderr]' \
+    '-o[write generated pack index into specified file]: :_files' \
+    '--stdin[read pack from stdin and instead write to specified file]' \
+    $stdin_opts \
+    '--strict[die if the pack contains broken objects or links]' \
+    ':pack file:_files -g "*.pack"' && ret=0
+}
 
-  [[ -n "$PREFIX$SUFFIX" ]]
+(( $+functions[_git-merge-file] )) ||
+_git-merge-file () {
+  integer n_labels=${#${(M)words[1,CURRENT-1]:#-L}}
+  local label_opt=
+
+  if (( n_labels < 3 )) || [[ $words[CURRENT-1] == -L ]]; then
+    local -a ordinals
+
+    ordinals=(first second third)
+
+    label_opt="*-L[label to use for the $ordinals[n_labels+1] file]:label"
+  fi
+
+  # TODO: --marker-size in undocumented.
+  # TODO: --diff3 is undocumented.
+  _arguments \
+    $label_opt \
+    '(-p --stdout)'{-p,--stdout}'[send merged file to standard output instead of overwriting first file]' \
+    '(-q --quiet)'{-q,--quiet}'[do not warn about conflicts]' \
+    '(       --theirs --union)--ours[resolve conflicts favoring our side of the lines]' \
+    '(--ours          --union)--theirs[resolve conflicts favoring their side of the lines]' \
+    '(--ours --theirs        )--union[resolve conflicts favoring both sides of the lines]' \
+    '--marker-size[specify length of conflict markers]: :__git_guard_number "marker length"' \
+    '--diff3[undocumented]' \
+    ':current file:_files' \
+    ':base file:_files' \
+    ':other file:_files' && ret=0
 }
 
-__git_guard_diff-stat-width () {
-  if [[ $PREFIX == *,* ]]; then
-    compset -P '*,'
-    _guard "[[:digit:]]#" "filename width"
+(( $+functions[_git-merge-index] )) ||
+_git-merge-index () {
+  if (( CURRENT > 2 )) && [[ $words[CURRENT-1] != -[oq] ]]; then
+    _arguments -S \
+      '(:)-a[run merge against all files in index that need merging]' \
+      '*: :__git_cached_files' && ret=0
   else
-    compset -S ',*'
-    _guard "[[:digit:]]#" "width"
+    declare -a arguments
+
+    (( CURRENT == 2 )) && arguments+='-o[skip failed merges]'
+    (( CURRENT == 2 || CURRENT == 3 )) && arguments+='(-o)-q[do not complain about failed merges]'
+    (( 2 <= CURRENT && CURRENT <= 4 )) && arguments+='*:merge program:_files -g "*(*)"'
+
+    _arguments -S $arguments && ret=0
   fi
 }
 
-(( $+functions[__git_command_successful] )) ||
-__git_command_successful () {
-  if (( ${#pipestatus:#0} > 0 )); then
-    _message 'not a git repository'
-    return 1
+(( $+functions[_git-mktag] )) ||
+_git-mktag () {
+  _message 'no arguments allowed; only accepts tags on standard input'
+}
+
+(( $+functions[_git-mktree] )) ||
+_git-mktree () {
+  _arguments -w -S -s \
+    '-z[read NUL-terminated ls-tree -z output]' \
+    '--missing[allow missing objects]' \
+    '--batch[allow creation of more than one tree]' && ret=0
+}
+
+(( $+functions[_git-pack-objects] )) ||
+_git-pack-objects () {
+  local thin_opt=
+
+  if (( words[(I)--stdout] )); then
+    thin_opt='--thin[create a thin pack]'
   fi
-  return 0
+
+  # NOTE: --index-version is only used by the Git test suite.
+  # TODO: --reflog is undocumented.
+  # TODO: --keep-unreachable is undocumented.
+  # TODO: --unpack-unreachable is undocumented.
+  _arguments -A '-*' \
+    '(: --max-pack-size)--stdout[write pack contents to standard output]' \
+    '--revs[read revision arguments from standard input]' \
+    '(--revs)--unpacked[limit objects to pack to those not already packed]' \
+    '(--revs)--all[include all refs as well as revisions already specified]' \
+    '--include-tag[include unasked-for annotated tags if object they reference is included]' \
+    '--window=-[number of objects to use per delta compression]: :__git_guard_number "window size"' \
+    '--depth=-[maximum delta depth]: :__git_guard_number "maximum delta depth"' \
+    '--window-memory=-[window size in memory]:window size:__git_guard_bytes' \
+    '(--stdout)--max-pack-size=[maximum size of each output packfile]:maximum pack size:__git_guard_bytes' \
+    '--honor-pack-keep[ignore objects in local pack with .keep file]' \
+    '(              --local)--incremental[ignore objects that have already been packed]' \
+    '(--incremental        )--local[similar to --incremental, but only ignore unpacked non-local objects]' \
+    '--non-empty[only create a package if it contains at least one object]' \
+    '(           --all-progress)--progress[display progress on standard error]' \
+    '(--progress                --all-progress-implied)--all-progress[display progress output on standard error, even during write-out phase]' \
+    '(--all-progress)--all-progress-implied[like --all-progress, but only if --progress was also passed]' \
+    '-q[do not report progress]' \
+    '--no-reuse-delta[do not reuse existing deltas, but compute them from scratch]' \
+    '--no-reuse-object[do not reuse existing object data]' \
+    '--compression=-[specify compression level]: :__git_compression_levels' \
+    $thin_opt \
+    '--delta-base-offset[use delta-base-offset packing]' \
+    '--threads=-[specify number of threads for searching for best delta matches]: :__git_guard_number "number of threads"' \
+    '--keep-true-parents[pack parents hidden by grafts]' \
+    '(                   --unpack-unreachable)--keep-unreachable[undocumented]' \
+    '(--keep-unreachable                     )--unpack-unreachable[undocumented]' \
+    ':base-name:_files' && ret=0
 }
 
-(( $+functions[__git_objects] )) ||
-__git_objects () {
-  compset -P '*:'
-  if [[ -n $IPREFIX ]]; then
-    __git_tree_files "$PREFIX" "${IPREFIX%:}"
-  else
-    _alternative \
-      'revisions:revision:__git_revisions' \
-      'files:file:__git_files'
+(( $+functions[_git-prune-packed] )) ||
+_git-prune-packed () {
+  _arguments -w -S -s \
+    '(-n --dry-run)'{-n,--dry-run}'[only list objects that would be removed]' \
+    '(-q --quiet)'{-q,--quiet}'[do not display progress on standard error]' && ret=0
+}
+
+(( $+functions[_git-read-tree] )) ||
+_git-read-tree () {
+  local trivial_opt= aggressive_opt=
+
+  if (( words[(I)-m] )); then
+    trivial_opt='--trivial[restrict three-way merge to only happen if no file-level merging is required]'
+    aggressive_opt='--aggressive[try harder to resolve merge conflicts]'
   fi
+
+  local -a ui_opts
+
+  if (( words[(I)(-m|--reset|--prefix)] )); then
+    ui_opts=(
+      '(   -i)-u[update the work tree after successful merge]'
+      '(-u   )-i[update only the index; ignore changes in work tree]')
+  fi
+
+  local exclude_per_directory_opt
+
+  if (( words[(I)-u] )); then
+    exclude_per_directory_opt='--exclude-per-directory=-[specify .gitignore file]:.gitignore file:_files'
+  fi
+
+  _arguments -w -S -s \
+    '(   --reset --prefix)-m[perform a merge, not just a read]' \
+    '(-m         --prefix)--reset[perform a merge, not just a read, ignoring unmerged entries]' \
+    '(-m --reset          2 3)--prefix=-[read the contents of specified tree-ish under specified directory]:prefix:_directories -r ""' \
+    $ui_opts \
+    '-v[display progress on standard error]' \
+    $trivial_opt \
+    $aggressive_opt \
+    $exclude_per_directory_opt \
+    '--index-output=[write index in the named file instead of $GIT_INDEX_FILE]: :_files' \
+    '--no-sparse-checkout[display sparse checkout support]' \
+    '1:first tree-ish to be read/merged:__git_tree_ishs' \
+    '2::second tree-ish to be read/merged:__git_tree_ishs' \
+    '3::third tree-ish to be read/merged:__git_tree_ishs' && ret=0
 }
 
-(( $+functions[__git_trees] )) ||
-__git_trees () {
-  __git_objects
+(( $+functions[_git-symbolic-ref] )) ||
+_git-symbolic-ref () {
+  _arguments -w -S -s \
+    '(-q --quiet)'{-q,--quiet}'[do not issue error if specified name is not a symbolic ref]' \
+    '-m[update reflog for specified name with specied reason]:reason for update' \
+    ':symbolic reference:__git_heads' \
+    ':: :__git_references' && ret=0
 }
 
-(( $+functions[__git_tree_ishs] )) ||
-__git_tree_ishs () {
-  __git_commits
+(( $+functions[_git-unpack-objects] )) ||
+_git-unpack-objects () {
+  _arguments \
+    '-n[only list the objects that would be unpacked]' \
+    '-q[run quietly]' \
+    '-r[try recovering objects from corrupt packs]' \
+    '--strict[do not write objects with broken content or links]' && ret=0
 }
 
-(( $+functions[__git_blobs] )) ||
-__git_blobs () {
-  __git_objects
+(( $+functions[_git-update-index] )) ||
+_git-update-index () {
+  local z_opt
+
+  if (( words[(I)--stdin|--index-info] )); then
+    z_opt='-z[paths are separated with NUL character when reading from stdin]'
+  fi
+
+  _arguments -S \
+    $refreshables \
+    '(-)'{-h,--help}'[display usage information]' \
+    '--add[add files not already in index]' \
+    '(         --force-remove)--remove[remove files that are in the index but are missing from the work tree]' \
+    '(--remove               )--force-remove[remove files from both work tree and index]' \
+    '(-q --unmerged --ignore-missing --really-refresh)--refresh[refresh index]' \
+    '-q[run quietly]' \
+    '--ignore-submodules[do not try to update submodules]' \
+    '--unmerged[if unmerged changes exists, ignore them instead of exiting]' \
+    '--ignore-missing[ignore missing files when refreshing the index]' \
+    '*--cacheinfo[insert information directly into the cache]: :_guard "[0-7]#" "octal file mode": :_guard "[[\:xdigit\:]]#" "object id": :_files' \
+    '(: -)--index-info[read index information from stdin]' \
+    '--chmod=-[set execute permissions on updated files]:permission:((-x\:executable +x\:"not executable"))' \
+    '(                   --no-assume-unchanged)--assume-unchanged[set "assume unchanged" bit for given paths]' \
+    '(--assume-unchanged                      )--no-assume-unchanged[unset "assume unchanged" bit for given paths]' \
+    '(-q --unmerged --ignore-missing --refresh)--really-refresh[refresh index, unconditionally checking stat information]' \
+    '(                --no-skip-worktree)--skip-worktree[set "skip-worktree" bit for given paths]' \
+    '(--skip-worktree                   )--no-skip-worktree[unset "skip-worktree" bit for given paths]' \
+    '(-)'{-g,--again}'[run git-update-index on differing index entries]' \
+    '(-)--unresolve[restore "unmerged" or "needs updating" state of files]' \
+    '--info-only[only insert files object-IDs into index]' \
+    '(--remove)--force-remove[remove file from index even when working directory has no such file]' \
+    '--replace[replace files already in index, if necessary]' \
+    '(: -)--stdin[read list of paths from standard input]' \
+    '--verbose[report what is being added and removed from the index]' \
+    $z_opt \
+    '*:: :_files' && ret=0
 }
 
-(( $+functions[__git_stages] )) ||
-__git_stages () {
-  __git_guard $* "[[:digit:]]#" 'stage'
+(( $+functions[_git-update-ref] )) ||
+_git-update-ref () {
+  _arguments -w -S -s \
+    '-m[update reflog for specified name with specied reason]:reason for update' \
+    '(:)-d[delete given reference after verifying its value]:symbolic reference:__git_revisions:old reference:__git_revisions' \
+    '--no-deref[overwrite ref itself, not what it points to]' \
+    ':symbolic reference:__git_revisions' \
+    ':new reference:__git_revisions' \
+    '::old reference:__git_revisions' && ret=0
 }
 
-(( $+functions[__git_files_relative] )) ||
-__git_files_relative () {
-  local rawfiles files file f_parts prefix p_parts tmp
+(( $+functions[_git-write-tree] )) ||
+_git-write-tree () {
+  # NOTE: --ignore-cache-tree is only used for debugging.
+  _arguments -w -S -s \
+    '--missing-ok[ignore objects in index that are missing in object database]' \
+    '--prefix=[write tree representing given sub-directory]:sub-directory:_directories -r ""' && ret=0
+}
 
-  prefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null)
-  __git_command_successful || return
+# Interrogation commands
 
-  # Empty prefix, no modifications
-  if (( $#prefix == 0 )); then
-    print $1
-    return
+(( $+functions[_git-cat-file] )) ||
+_git-cat-file () {
+  _arguments -w -S -s \
+    '(- 1)-t[show type of given object]' \
+    '(- 1)-s[show size of given object]' \
+    '(- 1)-e[exit with zero status if object exists]' \
+    '(- 1)-p[pretty-print given object]' \
+    '(- 1)--textconv[show content as transformed by a textconv filter]' \
+    '(- :)--batch[print SHA1, type, size, and contents of each object provided on stdin]' \
+    '(- :)--batch-check[print SHA1, type, and size of each object provided on stdin]' \
+    '(-):object type:(blob commit tag tree)' \
+    ': :__git_objects' && ret=0
+}
+
+(( $+functions[_git-diff-files] )) ||
+_git-diff-files () {
+  declare -a revision_options
+  __git_setup_revision_options
+
+  _arguments -w -S -s \
+    $revision_options \
+    ': :__git_changed-in-working-tree_files' \
+    ': :__git_changed-in-working-tree_files' \
+    '*: :__git_changed-in-working-tree_files' && ret=0
+}
+
+(( $+functions[_git-diff-index] )) ||
+_git-diff-index () {
+  local -a revision_options
+  __git_setup_revision_options
+
+  # TODO: Description of -m doesn’t match that for git-rev-list.  What’s going
+  # on here?
+  # TODO: With --cached, shouldn’t we only list files changed in index compared
+  # to given tree-ish?  This should be done for git-diff as well, in that case.
+  _arguments -S \
+    $revision_options \
+    '--cached[do not consider the work tree at all]' \
+    '-m[flag non-checked-out files as up-to-date]' \
+    ': :__git_tree_ishs' \
+    '*: :__git_cached_files' && ret=0
+}
+
+(( $+functions[_git-diff-tree] )) ||
+_git-diff-tree () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  declare -a revision_options
+  __git_setup_revision_options
+
+  # NOTE: -r, -t, --root are actually parsed for all
+  # __git_setup_revision_options, but only used by this command, so only have
+  # them here.
+  _arguments -w -C -S -s \
+    $revision_options \
+    '-r[recurse into subdirectories]' \
+    '(-r   )-t[disply tree objects in diff output]' \
+    '--root[display root diff]' \
+    '-m[do not ignore merges]' \
+    '-s[do not show differences]' \
+    '(--pretty --header)-v[display commit message before differences]' \
+    '--no-commit-id[do not display commit IDs]' \
+    '(-c --cc)-c[show differences from each of parents to merge result]' \
+    '(-c --cc)--cc[how differences from each of parents and omit differences from only one parent]' \
+    '--always[always show commit itself and commit log message]' \
+    ': :__git_tree_ishs' \
+    '*:: :->files' && ret=0
+
+  case $state in
+    (files)
+      if (( $#line > 2 )); then
+        # TODO: It would be better to output something like
+        #
+        # common files:
+        #   ...
+        # original tree:
+        #   ...
+        # new tree:
+        #   ...
+        _alternative \
+          "original-tree-files:original tree:__git_tree_files ${PREFIX:-.} $line[1]" \
+          "new-tree-files:new tree:__git_tree_files ${PREFIX:-.} $line[2]" && ret=0
+      else
+        _alternative \
+          'tree-ishs::__git_tree_ishs' \
+          "tree-files::__git_tree_files ${PREFIX:-.} $line[1]" && ret=0
+      fi
+      ;;
+  esac
+}
+
+(( $+functions[_git-for-each-ref] )) ||
+_git-for-each-ref () {
+  # TODO: Better completion for --format: should complete %(field) stuff, that
+  # is, %(refname), %(objecttype), %(objectsize), %(objectname) with optional ‘*’
+  # in front.
+  _arguments -w -S -s \
+    '--count=[maximum number of refs to iterate over]: :__git_guard_number "maximum number of refs"' \
+    '--sort=[key to sort refs by]: :__git_ref_sort_keys' \
+    '--format=-[output format of ref information]:format' \
+    '(-s --shell -p --perl --python --tcl)'{-s,--shell}'[use string literals suitable for sh]' \
+    '(-s --shell -p --perl --python --tcl)'{-p,--perl}'[use string literals suitable for Perl]' \
+    '(-s --shell -p --perl          --tcl)'--python'[use string literals suitable for Python]' \
+    '(-s --shell -p --perl --python      )'--tcl'[use string literals suitable for Tcl]' \
+    ':: :_guard "([^-]?#|)" pattern' && ret=0
+}
+
+(( $+functions[_git-ls-files] )) ||
+_git-ls-files () {
+  local no_empty_directory_opt=
+
+  if (( words[(I)--directory] )); then
+    no_empty_directory_opt='--no-empty-directory[do not list empty directories]'
   fi
 
-  rawfiles=(${(ps:\0:)1})
-  files=()
+  # TODO: --resolve-undo is undocumented.
+  # TODO: Replace _files with something more intelligent based on seen options.
+  # TODO: Apply excludes like we do for git-clean.
+  _arguments -w -S -s \
+    '(-c --cached)'{-c,--cached}'[show cached files in output]' \
+    '(-d --deleted)'{-d,--deleted}'[show deleted files in output]' \
+    '(-m --modified)'{-m,--modified}'[show modified files in output]' \
+    '(-o --others)'{-o,--others}'[show other files in output]' \
+    '(-i --ignored)'{-i,--ignored}'[show ignored files in output]' \
+    '(-s --stage --with-tree)'{-s,--stage}'[show stage files in output]' \
+    '--directory[if a whole directory is classified as "other", show just its name]' \
+    $no_empty_directory_opt \
+    '(-s --stage -u --unmerged --with-tree)'{-u,--unmerged}'[show unmerged files in output]' \
+    '(-k --killed)'{-k,--killed}'[show killed files in output]' \
+    '-z[use NUL termination on output]' \
+    '*'{-x,--exclude=-}'[skip files matching given pattern]:file pattern' \
+    '*'{-X,--exclude-from=-}'[skip files matching patterns in given file]: :_files' \
+    '*--exclude-per-directory=-[skip directories matching patterns in given file]: :_files' \
+    '--exclude-standard[skip files in standard Git exclusion lists]' \
+    '--error-unmatch[if any file does not appear in index, treat this as an error]' \
+    '(-s --stage -u --unmerged)--with-tree=[treat paths removed since given tree-ish as still present]: :__git_tree_ishs' \
+    '-v[identify each files status (hmrck?)]' \
+    '--full-name[force paths to be output relative to the project top directory]' \
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+    '*:: :_files' && ret=0
+}
 
-  # Now we assume that we've given "absolute" paths list with "root"
-  # being repository top directory.  $prefix is also "absolute" path.
-  for file in $rawfiles; do
-    # Collapse "/./" and "//", strip "/." and "/" from tail (I know,
-    # this is a bit paranoid).
-    f_parts=(${(s:/:)"${${${${file//\/\///}//\/.\///}%%/.}%%/}"})
-    p_parts=(${(s:/:)"${${${${prefix//\/\///}//\/.\///}%%/.}%%/}"})
-    tmp=()
+(( $+functions[_git-ls-remote] )) ||
+_git-ls-remote () {
+  # TODO: repository needs fixing
+  _arguments -A '-*' \
+    '(-h --heads)'{-h,--heads}'[show only refs under refs/heads]' \
+    '(-t --tags)'{-t,--tags}'[show only refs under refs/tags]' \
+    '(-u --upload-pack)'{-u,--upload-pack=-}'[specify path to git-upload-pack on remote side]:remote path' \
+    ': :__git_any_repositories' \
+    '*: :__git_references' && ret=0
+}
 
-    # Strip common path prefix.
-    while (( $#f_parts > 0 )) && (( $#p_parts > 0 )) && [[ $f_parts[1] == $p_parts[1] ]]; do
-      f_parts[1]=()
-      p_parts[1]=()
-    done
+(( $+functions[_git-ls-tree] )) ||
+_git-ls-tree () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-    # If prefix still not empty, ascend up.
-    while (( $#p_parts > 0 )); do
-	tmp+=..
-	p_parts[1]=()
-    done
+  _arguments -w -C -S -s \
+    '(-t)-d[do not show children of given tree (implies -t)]' \
+    '-r[recurse into subdirectories]' \
+    '-t[show tree entries even when going to recurse them]' \
+    '(-l --long)'{-l,--long}'[show object size of blob entries]' \
+    '-z[use NUL termination on output]' \
+    '(--name-only --name-status)'{--name-only,--name-status}'[list only filenames, one per line]' \
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+    '--full-name[output full path-names]' \
+    '(--full-name)--full-tree[do not limit listing to current working-directory]' \
+    ': :__git_tree_ishs' \
+    '*:: :->file' && ret=0
 
-    # Add remaining path.
-    tmp=("$tmp[@]" "$f_parts[@]")
+  case $state in
+    (file)
+      __git_ignore_line __git_tree_files ${PREFIX:-.} $line[1] && ret=0
+      ;;
+  esac
+}
 
-    files+=${(j:/:)tmp}
-  done
+(( $+functions[_git-merge-base] )) ||
+_git-merge-base () {
+  _arguments -w -S -s \
+    '(-a --all)'{-a,--all}'[display all common ancestors]' \
+    '--octopus[compute best common ancestors of all supplied commits]' \
+    '(-)--independent[display minimal subset of supplied commits with same ancestors]' \
+    ': :__git_commits' \
+    '*: :__git_commits' && ret=0
+}
 
-  print ${(pj:\0:)files}
+(( $+functions[_git-name-rev] )) ||
+_git-name-rev () {
+  _arguments -S \
+    '--tags[only use tags to name commits]' \
+    '--refs=[only use refs matching given pattern]: :_guard "?#" "shell pattern"' \
+    '(--stdin :)--all[list all commits reachable from all refs]' \
+    '(--all :)--stdin[read from stdin and append revision-name]' \
+    '--name-only[display only name of commits]'
+    '--no-undefined[die with non-zero return when a reference is undefined]' \
+    '--always[show uniquely abbreviated commit object as fallback]' \
+    '(--stdin --all)*: :__git_commits' && ret=0
 }
 
-(( $+functions[__git_files] )) ||
-__git_files () {
-  local expl files ls_opts opts gitdir gitcdup
+(( $+functions[_git-pack-redundant] )) ||
+_git-pack-redundant () {
+  _arguments -S -A '-*' \
+    '(:)--all[process all packs]' \
+    '--alt-odb[do not require objects to be present in local packs]' \
+    '--verbose[output some statistics to standard error]' \
+    '(--all)*::packs:_files -g "*.pack"' && ret=0
+}
 
-  zparseopts -D -E -a opts -- -cached -deleted -modified -others -ignored -unmerged -killed
+(( $+functions[_git-rev-list] )) ||
+_git-rev-list () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-  __git_command_successful || return
+  declare -a revision_options
+  __git_setup_revision_options
 
-  gitcdup=$(_call_program gitcdup git rev-parse --show-cdup 2>/dev/null)
-  __git_command_successful || return
+  _arguments -C -S \
+    $revision_options \
+    '(--pretty)--header[display contents of commit in raw-format]' \
+    '--timestamp[print raw commit timestamp]' \
+    '(         --bisect-vars --bisect-all)--bisect[show only middlemost commit object]' \
+    '(--bisect)--bisect-vars[same as --bisect, displaying shell-evalable code]' \
+    '(--bisect)--bisect-all[display all commit objects beteen included and excluded commits]' \
+    '*:: :->commit-or-path' && ret=0
 
-  ls_opts=("--exclude-per-directory=.gitignore")
-  [[ -f "$gitdir/info/exclude" ]] && ls_opts+="--exclude-from=$gitdir/info/exclude"
+  case $state in
+    (commit-or-path)
+      # TODO: What paths should we be completing here?
+      if [[ -n ${opt_args[(I)--]} ]]; then
+        __git_cached_files && ret=0
+      else
+        _alternative \
+          'commit-ranges::__git_commit_ranges' \
+          'cached-files::__git_cached_files' && ret=0
+      fi
+      ;;
+  esac
+}
 
-  files=$(_call_program files git ls-files -z --full-name $ls_opts $opts -- $gitcdup 2>/dev/null)
-  __git_command_successful || return
-  files=(${(ps:\0:)"$(__git_files_relative $files)"})
-  __git_command_successful || return
+(( $+functions[_git-show-index] )) ||
+_git-show-index () {
+  _message 'no arguments allowed; accepts index file on standard input'
+}
 
-  _wanted files expl 'index file' _multi_parts $@ - / files
+(( $+functions[_git-show-ref] )) ||
+_git-show-ref () {
+  _arguments -S \
+    - list \
+      '(-h --head)'{-h,--head}'[show HEAD reference]' \
+      '--tags[show only refs/tags]' \
+      '--heads[show only refs/heads]' \
+      '(-d --dereference)'{-d,--dereference}'[dereference tags into object IDs as well]' \
+      '(-s --hash)'{-s+,--hash=-}'[only show the SHA-1 hash, not the reference name]:: :__git_guard_number length' \
+      '--verify[enable stricter reference checking]' \
+      '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' \
+      '(-q --quiet)'{-q,--quiet}'[do not print any results]' \
+      '*: :_guard "([^-]?#|)" pattern' \
+    - exclude \
+      '--exclude-existing=-[filter out existing refs from stdin]:: :_guard "([^-]?#|)" pattern' && ret=0
 }
 
-(( $+functions[__git_cached_files] )) ||
-__git_cached_files () {
-  __git_files $* --cached
+(( $+functions[_git-unpack-file] )) ||
+_git-unpack-file () {
+  _arguments -A '-*' \
+    '(:)-h[display usage information]' \
+    '(-): :__git_blobs' && ret=0
 }
 
-(( $+functions[__git_deleted_files] )) ||
-__git_deleted_files () {
-  __git_files $* --deleted
+(( $+functions[_git-var] )) ||
+_git-var () {
+  _arguments \
+    '(:)-l[show logical variables]' \
+    '(-):variable:((GIT_AUTHOR_IDENT\:"name and email of author" \
+                    GIT_COMMITTER_IDENT\:"name and email of committer" \
+                    GIT_EDITOR\:"text editor used by git commands" \
+                    GIT_PAGER\:"text viewer used by git commands"))' && ret=0
 }
 
-(( $+functions[__git_killed_files] )) ||
-__git_killed_files () {
-  __git_files $* --killed
+(( $+functions[_git-verify-pack] )) ||
+_git-verify-pack () {
+  _arguments -w -S -s \
+    '(-v --verbose)'{-v,--verbose}'[show objects contained in pack]' \
+    '(-s --stat-only)'{-s,--stat-only}'[do not verify pack contents; only display histogram of delta chain length]' \
+    '*:index file:_files -g "*.idx"' && ret=0
 }
 
-(( $+functions[__git_modified_files] )) ||
-__git_modified_files () {
-  __git_files $* --modified
+# Synching Repositories
+
+(( $+functions[_git-daemon] )) ||
+_git-daemon () {
+  # TODO: do better than _directories?  The directory needs to be a git-repository,
+  # so one could check for a required file in the given directory.
+  # TODO: --interpolated-path should complete %H, %CH, %IP, %P, and %D.
+  _arguments -S \
+    '--strict-paths[match paths exactly]' \
+    '--base-path=-[remap all the path requests as relative to the given path]:path:_directories' \
+    '--base-path-relaxed[allow lookup of base path witout prefix]' \
+    '--interpolated-path=-[dynamically construct alternate paths]:path:_directories' \
+    '--export-all[allow pulling from all repositories without verification]' \
+    '(--port --listen --user --group)--inetd[run server as an inetd service]' \
+    '(--inetd)--listen=-[listen on a specific IP address or hostname]: :_hosts' \
+    '(--inetd)--port=-[specify port to listen to]: :_ports' \
+    '--init-timeout=-[specify timeout between connection and request]: :__git_guard_number timeout' \
+    '--timeout=-[specify timeout for sub-requests]: :__git_guard_number timeout' \
+    '--max-connections=-[specify maximum number of concurrent clients]: :__git_guard_number "connection limit"' \
+    '--syslog[log to syslog instead of standard error]' \
+    '--user-path=-[allow ~user notation to be used in requests]::path:_directories' \
+    '--verbose[log details about incoming connections and requested files]' \
+    '--reuseaddr[reuse addresses when already bound]' \
+    '(--syslog)--detach[detach from the shell]' \
+    '--pid-file=-[save the process id in given file]:pid file:_files' \
+    '--user=-[set uid of daemon]: :_users' \
+    '--group=-[set gid of daemon]: :_groups' \
+    '--enable=-[enable site-wide service]: :__git_daemon_service' \
+    '--disable=-[disable site-wide service]: :__git_daemon_service' \
+    '--allow-override[allow overriding site-wide service]: :__git_daemon_service' \
+    '--forbid-override[forbid overriding site-wide service]: :__git_daemon_service' \
+    '*:repository:_directories' && ret=0
 }
 
-(( $+functions[__git_other_files] )) ||
-__git_other_files () {
-  __git_files $* --others
+(( $+functions[_git-fetch-pack] )) ||
+_git-fetch-pack () {
+  # TODO: Limit * to __git_head_references?
+  _arguments -A '-*' \
+    '--all[fetch all remote refs]' \
+    '(-q --quiet)'{-q,--quiet}'[make output less verbose]' \
+    '(-k --keep)'{-k,--keep}'[do not invoke git-unpack-objects on received data]' \
+    '--thin[fetch a thin pack]' \
+    '--include-tag[download referenced annotated tags]' \
+    '(--upload-pack --exec)'{--upload-pack=-,--exec=-}'[specify path to git-upload-pack on remote side]:remote path' \
+    '--depth=-[limit fetching to ancestor-chains not longer than given number]: :__git_guard_number "maximum ancestor-chain length"' \
+    '--no-progress[do not display progress]' \
+    '-v[produce verbose output]' \
+    ': :__git_any_repositories' \
+    '*: :__git_references' && ret=0
 }
 
-(( $+functions[__git_unmerged_files] )) ||
-__git_unmerged_files () {
-  __git_files $* --unmerged
+(( $+functions[_git-http-backend] )) ||
+_git-http-backend () {
+  _nothing
 }
 
-#this is for git-commit which can take files both git-added and not
-(( $+functions[__git_changed_files] )) ||
-__git_changed_files () {
-  local files
+(( $+functions[_git-send-pack] )) ||
+_git-send-pack () {
+  # TODO: --mirror is undocumented.
+  # TODO: --stateless-rpc is undocumented.
+  # TODO: --helper-status is undocumented.
+  _arguments -A '-*' \
+    '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[specify path to git-receive-pack on remote side]:remote path' \
+    '--all[update all refs that exist locally]' \
+    '--dry-run[do everything except actually sending the updates]' \
+    '--force[update remote orphaned refs]' \
+    '-v[produce verbose output]' \
+    '--thin[send a thin pack]' \
+    '--mirror[undocumented]' \
+    '--stateless-rpc[undocumented]' \
+    '--helper-status[undocumented]' \
+    ': :__git_any_repositories' \
+    '*: :__git_remote_references' && ret=0
+}
+
+(( $+functions[_git-update-server-info] )) ||
+_git-update-server-info () {
+  _arguments -w -S -s \
+    '(-f --force)'{-f,--force}'[update the info files from scratch]' && ret=0
+}
 
-  files=$(_call_program files git diff-index -z --name-only --no-color HEAD 2>/dev/null)
-  __git_command_successful || return
-  files=(${(ps:\0:)"$(__git_files_relative $files)"})
-  __git_command_successful || return
+(( $+functions[_git-http-fetch] )) ||
+_git-http-fetch () {
+  _arguments \
+    '-c[fetch commit objects]' \
+    '-t[fetch trees associated with commit objects]' \
+    '-a[fetch all objects]' \
+    '-v[report what is downloaded]' \
+    '-w[write commit-id into the filename under "$GIT_DIR/refs/<filename>"]:filename' \
+    '--recover[recover from a failed fetch]' \
+    '(1)--stdin[read commit ids and refs from standard input]' \
+    ': :__git_commits' \
+    ': :_urls' && ret=0
+}
 
-  _wanted files expl 'index file' _multi_parts $@ - / files
+(( $+functions[_git-http-push] )) ||
+_git-http-push () {
+  _arguments \
+    '--all[verify that all objects in local ref history exist remotely]' \
+    '--force[allow refs that are not ancestors to be updated]' \
+    '--dry-run[do everything except actually sending the updates]' \
+    '--verbose[report the list of objects being walked locally and sent to remote]' \
+    '(   -D)-d[remove refs from remote repository]' \
+    '(-d   )-D[forcefully remove refs from remote repository]' \
+    ': :_urls' \
+    '*: :__git_remote_references' && ret=0
 }
 
-(( $+functions[__git_tree_files] )) ||
-__git_tree_files () {
-  local multi_parts_opts
-  local tree Path
-  integer at_least_one_tree_added
-  local -a tree_files compadd_opts
+# NOTE: git-parse-remote isn’t a user command.
 
-  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
+(( $+functions[_git-receive-pack] )) ||
+_git-receive-pack () {
+  # TODO: --advertise-refs is undocumented.
+  # TODO: --stateless-rpc is undocumented.
+  _arguments -A '-*' \
+    '--advertise-refs[undocumented]' \
+    '--stateless-rpc[undocumented]' \
+    ':directory to sync into:_directories' && ret=0
+}
 
-  [[ "$1" == */ ]] && Path="$1" || Path="${1:h}/"
-  shift
-  (( at_least_one_tree_added = 0 ))
-  for tree in $*; do
-    tree_files+=(${(ps:\0:)"$(_call_program tree-files git ls-tree --name-only -z $tree $Path 2>/dev/null)"})
-    __git_command_successful && (( at_least_one_tree_added = 1 ))
-  done
+(( $+functions[_git-shell] )) ||
+_git-shell () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
 
-  if (( !at_least_one_tree_added )); then
-    return 1
+  _arguments -C \
+    '-c[command to execute]: :->command' \
+    ': :->argument' && ret=0
+
+  case $state in
+    (command)
+      declare -a commands
+
+      commands=(
+        git-receive-pack
+        git-upload-pack
+        git-upload-archive
+        cvs)
+
+      _describe -t commands command commands && ret=0
+      ;;
+    (argument)
+      case $line[1] in
+        (git-receive-pack)
+          local expl
+
+          _description directories expl 'directory to sync into'
+          _directories $expl && ret=0
+          ;;
+        (git-upload-pack|git-upload-archive)
+          local expl
+
+          _description directories expl 'directory to sync from'
+          _directories $expl && ret=0
+          ;;
+        (cvs)
+          compadd - server && ret=0
+      esac
+      ;;
+  esac
+}
+
+
+(( $+functions[_git-upload-archive] )) ||
+_git-upload-archive () {
+  _arguments \
+    ':directory to get tar archive from:_directories' && ret=0
+}
+
+(( $+functions[_git-upload-pack] )) ||
+_git-upload-pack () {
+  # TODO: --advertise-refs is undocumented.
+  # TODO: --stateless-rpc is undocumented.
+  _arguments -S -A '-*' \
+    '--strict[do not try <directory>/.git/ if <directory> is not a git directory' \
+    '--timeout=-[interrupt transfer after given number of seconds of inactivity]: :__git_guard_number "inactivity timeout"' \
+    '--advertise-refs[undocumented]' \
+    '--stateless-rpc[undocumented]' \
+    ': :_directories' && ret=0
+}
+
+# Internal Helper Commands
+
+(( $+functions[_git-check-attr] )) ||
+_git-check-attr () {
+  local z_opt=
+
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  if (( words[(I)--stdin] )); then
+    z_opt='-z[paths are separated with NUL character when reading from stdin]'
   fi
 
-  local expl
-  _wanted files expl 'tree file' _multi_parts -f $compadd_opts -- / tree_files
+  _arguments -C \
+    '--stdin[read file names from stdin instead of from command line]' \
+    $z_opt \
+    '(-)--[interpret preceding arguments as attributes and following arguments as path names]' \
+    '*:: :->attribute-or-file' && ret=0
+
+  case $state in
+    (attribute-or-file)
+      local -a attributes
+
+      attributes=(crlf ident filter diff merge)
+
+      local only_attributes=1
+      for (( i = 2; i < $#words; i++ )); do
+        if (( attributes[(I)$words[i]] == 0 )); then
+          only_attributes=0
+          break
+        fi
+      done
+
+      if (( !only_attributes )) || [[ -n ${opt_args[(I)--]} ]]; then
+        __git_cached_files && ret=0
+      else
+        _alternative \
+          'attributes::__git_attributes' \
+          'files::__git_cached_files' && ret=0
+      fi
+      ;;
+  esac
 }
 
-# TODO: deal with things that __git_heads and __git_tags has in common (i.e.,
-# if both exists, they need to be completed to heads/x and tags/x.
-(( $+functions[__git_commits] )) ||
-__git_commits () {
-  _alternative \
-    'heads::__git_heads' \
-    'tags::__git_tags'
+(( $+functions[_git-check-ref-format] )) ||
+_git-check-ref-format () {
+  _arguments \
+    '-h[display usage information]' \
+    '--print[display canonicalized name of hypothetical reference of given name]' \
+    '--branch[expand previous branch syntax]' \
+    ': :__git_references' && ret=0
 }
 
-(( $+functions[__git_committishs] )) ||
-__git_committishs () {
-  __git_commits
+(( $+functions[_git-fmt-merge-msg] )) ||
+_git-fmt-merge-msg () {
+  _arguments -w -S -s \
+    '(      --no-log)--log[display one-line descriptions from actual commits being merged]' \
+    '(--log         )--no-log[do not display one-line descriptions from actual commits being merged]' \
+    '(-m --message)'{-m+,--message=}'[use given message instead of branch names for first line in log message]:message' \
+    '(-F --file)'{-F,--file}'[specify list of merged objects from file]: :_files' && ret=0
 }
 
-# TODO: deal with prefixes and suffixes listed in git-rev-parse
-(( $+functions[__git_revisions] )) ||
-__git_revisions () {
-  __git_commits $*
+(( $+functions[_git-mailinfo] )) ||
+_git-mailinfo () {
+  # TODO: --no-inbody-headers is undocumented.
+  _arguments -A '-*' \
+    '-k[do not strip/add \[PATCH\] from first line of commit message]' \
+    '(-u --encoding)-u[encode commit information in UTF-8]' \
+    '(-u --encoding)--encoding=-[encode commit information in given encoding]: :__git_encodings' \
+    '-n[disable all charset re-coding of metadata]' \
+    '(           --no-scissors)--scissors[remove everything in body before a scissors line]' \
+    '(--scissors              )--no-scissors[do not remove everything in body before a scissors line]' \
+    '--no-inbody-headers[undocumented]' \
+    ':message file:_files' \
+    ':patch file:_files' && ret=0
 }
 
-(( $+functions[__git_commits2] )) ||
-__git_commits2 () {
-  compset -P '\\\^'
-  __git_commits
+(( $+functions[_git-mailsplit] )) ||
+_git-mailsplit () {
+  _arguments -S -A '-*' \
+    '-o-[directory in which to place individual messages]:directory:_directories' \
+    '-b[if file does not begin with "From " line, assume it is a single mail message]' \
+    '-d-[specify number of leading zeros]: :__git_guard_number precision' \
+    '-f-[skip the first N numbers]: :__git_guard_number' \
+    '--keep-cr[do not remove CR from lines ending with CR+LF]' \
+    '*::mbox file:_files' && ret=0
 }
 
-(( $+functions[__git_commit_ranges] )) ||
-__git_commit_ranges () {
-  compset -P '*..'
-  __git_commits $*
+(( $+functions[_git-merge-one-file] )) ||
+_git-merge-one-file () {
+  _message 'you probably should not be issuing this command'
 }
 
-(( $+functions[__git_commit_ranges2] )) ||
-__git_commit_ranges2 () {
-  _alternative \
-    'commits::__git_commits2' \
-    'ranges::__git_commit_ranges'
+(( $+functions[_git-patch-id] )) ||
+_git-patch-id () {
+  _message 'no arguments allowed; accepts patch on standard input'
 }
 
-# FIXME: these should be imported from _ssh
-# TODO: this should take -/ to only get directories
-_remote_files () {
-  # There should be coloring based on all the different ls -F classifiers.
-  local expl rempat remfiles remdispf remdispd args suf ret=1
+# NOTE: git-sh-setup isn’t a user command.
 
-  if zstyle -T ":completion:${curcontext}:files" remote-access; then
-    zparseopts -D -E -a args p: 1 2 4 6 F:
-    if [[ -z $QIPREFIX ]]
-    then rempat="${PREFIX%%[^./][^/]#}\*"
-    else rempat="${(q)PREFIX%%[^./][^/]#}\*"
-    fi
-    remfiles=(${(M)${(f)"$(_call_program files ssh $args -a -x ${IPREFIX%:} ls -d1FL "$rempat" 2>/dev/null)"}%%[^/]#(|/)})
-    compset -P '*/'
-    compset -S '/*' || suf='remote file'
+(( $+functions[_git-stripspace] )) ||
+_git-stripspace () {
+  _arguments \
+    '(-s --strip-comments)'{-s,--strip-comments}'[also strip lines starting with #]' && ret=0
+}
 
-#    remdispf=(${remfiles:#*/})
-    remdispd=(${(M)remfiles:#*/})
+# INTERNAL GIT COMPLETION FUNCTIONS
 
-    _tags files
-    while _tags; do
-      while _next_label files expl ${suf:-remote directory}; do
-#        [[ -n $suf ]] && compadd "$@" "$expl[@]" -d remdispf \
-#	    ${(q)remdispf%[*=@|]} && ret=0
-	compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \
-	    ${(q)remdispd%/} && ret=0
-      done
-      (( ret )) || return 0
-    done
-    return ret
-  else
-    _message -e remote-files 'remote file'
+# Generic Helpers
+
+(( $+functions[__git_command_successful] )) ||
+__git_command_successful () {
+  if (( ${#*:#0} > 0 )); then
+    _message 'not a git repository'
+    return 1
   fi
+  return 0
 }
 
-(( $+functions[__git_remote_repository] )) ||
-__git_remote_repository () {
-  local service
+(( $+functions[__git_committish_range_first] )) ||
+__git_committish_range_first () {
+  print -r -- ${1%..(.|)*}
+}
 
-  service= _ssh
+(( $+functions[__git_committish_range_last] )) ||
+__git_committish_range_last () {
+  print -r -- ${1##*..(.|)}
+}
 
-  if compset -P '*:'; then
-    _remote_files
-  else
-    _ssh_hosts -S:
-  fi
+(( $+functions[__git_pattern_escape] )) ||
+__git_pattern_escape () {
+  print -r -n ${1//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}
 }
 
-(( $+functions[__git_repository] )) ||
-__git_repository () {
-  _alternative \
-    'directories::_directories' \
-    'remote repositories::__git_remote_repository'
+(( $+functions[__git_is_type] )) ||
+__git_is_type () {
+  git rev-parse -q --verify "$2^{$1}" 2>/dev/null >/dev/null
 }
 
-# should also be $GIT_DIR/remotes/origin
-(( $+functions[__git_any_repositories] )) ||
-__git_any_repositories () {
-  _alternative \
-    'directories::_directories' \
-    'remotes::__git_remotes' \
-    'remote repositories::__git_remote_repository'
+(( $+functions[__git_is_blob] )) ||
+__git_is_blob () {
+  __git_is_type blob $1
+}
+(( $+functions[__git_is_committish] )) ||
+__git_is_committish () {
+  __git_is_type commit $1
 }
 
-(( $+functions[__git_remotes] )) ||
-__git_remotes () {
-  local expl gitdir remotes
+(( $+functions[__git_is_treeish] )) ||
+__git_is_treeish () {
+  __git_is_type tree $1
+}
+
+(( $+functions[__git_is_committish_range] )) ||
+__git_is_committish_range () {
+  # TODO: This isn’t quite right.  We would like to do parts=${(~s:..(.|))},
+  # but that doesn’t work.  (This would allow us to make sure that parts only
+  # contains two elements and then apply __git_is_committish on them.
+  [[ $1 == *..(.|)* ]] &&
+    __git_is_committish $(__git_committish_range_first $1) &&
+    __git_is_committish $(__git_committish_range_last $1)
+}
+
+(( $+functions[__git_is_initial_commit] )) ||
+__git_is_initial_commit () {
+  git rev-parse -q --verify HEAD >/dev/null 2>/dev/null
+  (( $? == 1 ))
+}
+
+(( $+functions[__git_is_in_middle_of_merge] )) ||
+__git_is_in_middle_of_merge () {
+  local gitdir
 
   gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-  __git_command_successful || return
+  __git_command_successful $pipestatus || return
 
-#  zparseopts -a opts X+:
-#
-#  if (( !$opts[(I)-X] )); then
-#    descr=remote
-#  fi
+  [[ -f $gitdir/MERGE_HEAD ]]
+}
 
-  remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-  __git_command_successful || return
+# Completion Wrappers
 
-  # TODO: Should combine the two instead of either or.
-  if (( $#remotes > 0 )); then
-    _wanted remotes expl remote compadd $* - $remotes
-  else
-    _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
-  fi
+(( $+functions[__git_ignore_line] )) ||
+__git_ignore_line () {
+  declare -a ignored
+  ignored=()
+  ((CURRENT > 1)) &&
+    ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  ((CURRENT < $#line)) &&
+    ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  $* -F ignored
+}
+
+(( $+functions[__git_ignore_line_inside_arguments] )) ||
+__git_ignore_line_inside_arguments () {
+  __git_ignore_line ${*[-1]} ${*[1,-2]}
+}
+
+# Common Argument Types
+
+(( $+functions[_git_commands] )) ||
+_git_commands () {
+  local -a main_porcelain_commands
+  main_porcelain_commands=(
+    add:'add file contents to index'
+    am:'apply patches from a mailbox'
+    archive:'create archive of files from named tree'
+    bisect:'find, by binary search, change that introduced a bug'
+    branch:'list, create, or delete branches'
+    bundle:'move objects and refs by archive'
+    checkout:'checkout branch or paths to working tree'
+    cherry-pick:'apply changes introduced by some existing commits'
+    citool:'graphical alternative to git commit'
+    clean:'remove untracked files from working tree'
+    clone:'clone repository into new directory'
+    commit:'record changes to repository'
+    describe:'show most recent tag that is reachable from a commit'
+    diff:'show changes between commits, commit and working tree, etc.'
+    fetch:'download objects and refs from another repository'
+    format-patch:'prepare patches for e-mail submission'
+    gc:'cleanup unnecessary files and optimize local repository'
+    grep:'print lines matching a pattern'
+    gui:'run portable graphical interface to git'
+    init:'create empty git repository or re-initialize an existing one'
+    log:'show commit logs'
+    merge:'join two or more development histories together'
+    mv:'move or rename file, directory, or symlink'
+    notes:'add or inspect object notes'
+    pull:'fetch from and merge with another repository or local branch'
+    push:'update remote refs along with associated objects'
+    rebase:'fasforward-port local commits to the updated upstream head'
+    reset:'reset current HEAD to specified state'
+    revert:'revert existing commits'
+    rm:'remove files from the working tree and from the index'
+    shortlog:'summarize git log output'
+    show:'show various types of objects'
+    stash:'stash away changes to dirty working directory'
+    status:'show working-tree status'
+    submodule:'initialize, update, or inspect submodules'
+    tag:'create, list, delete or verify tag object signed with GPG'
+    gitk:'brows the repository interactively')
+
+  local -a ancillary_manipulator_commands
+  ancillary_manipulator_commands=(
+    config:'get and set repository or global options'
+    fast-export:'data exporter'
+    fast-import:'import information into git directly'
+    filter-branch:'rewrite branchers'
+    mergetool:'run merge conflict resolution tools to resolve merge conflicts'
+    pack-refs:'pack heads and tags for efficient repository access'
+    prune:'prune all unreachable objects from the object database'
+    reflog:'manage reflog information'
+    relink:'hardlink common objects in local repositories'
+    remote:'manage set of tracked repositories'
+    repack:'pack unpacked objects in a repository'
+    replace:'create, list, delete refs to replace objects')
+
+  local -a ancillary_interrogator_commands
+  ancillary_interrogator_commands=(
+    blame:'show what revision and author last modified each line of a file'
+    cherry:'find commits not merged upstream'
+    count-objects:'count unpacked objects and display their disk consumption'
+    difftool:'show changes using common diff tools'
+    fsck:'verify connectivity and validity of objects in database'
+    get-tar-commit-id:'extract commit ID from an archive created using git archive'
+    help:'display help information about git'
+    instaweb:'instantly browse your working repository in gitweb'
+    merge-tree:'show three-way merge without touching index'
+    rerere:'reuse recorded resolution of conflicted merges'
+    rev-parse:'pick out and massage parameters for other git commands'
+    show-branch:'show branches and their commits'
+    verify-tag:'check GPG signature of tags'
+    whatchanged:'show commit-logs and differences they introduce')
+
+  local -a interaction_commands
+  interaction_commands=(
+    archimport:'import an Arch repository into git'
+    cvsexportcommit:'export a single commit to a CVS checkout'
+    cvsimport:'import a CVS "repository" into a git repository'
+    cvsserver:'run a CVS server emulator for git'
+    imap-send:'send a collection of patches to an IMAP folder'
+    quiltimport:'apply a quilt patchset'
+    request-pull:'generate summary of pending changes'
+    send-email:'send collection of patches as emails'
+    svn:'bidirectional operation between a Subversion repository and git')
+
+  local -a plumbing_manipulator_commands
+  plumbing_manipulator_commands=(
+    apply:'apply patch to files and/or to index'
+    checkout-index:'copy files from index to working directory'
+    commit-tree:'create new commit object'
+    hash-object:'compute object ID and optionally create a blob from a file'
+    index-pack:'build pack index file for an existing packed archive'
+    merge-file:'run a three-way file merge'
+    merge-index:'run merge for files needing merging'
+    mktag:'create tag object'
+    mktree:'build tree-object from git ls-tree formatted text'
+    pack-objects:'create packed archive of objects'
+    prune-packed:'remove extra objects that are already in pack files'
+    read-tree:'read tree information into directory index'
+    symbolic-ref:'read and modify symbolic references'
+    unpack-objects:'unpack objects from packed archive'
+    update-index:'register file contents in the working directory to the index'
+    update-ref:'update object name stored in a reference safely'
+    write-tree:'create tree from the current index')
+
+  local -a plumbing_interrogator_commands
+  plumbing_interrogator_commands=(
+    cat-file:'provide content or type information for repository objects'
+    diff-files:'compare files in working tree and index'
+    diff-index:'compare content and mode of blobs between index and repository'
+    diff-tree:'compare content and mode of blobs found via two tree objects'
+    for-each-ref:'output information on each ref'
+    ls-files:'information about files in index/working directory'
+    ls-remote:'show references in a remote repository'
+    ls-tree:'list contents of a tree object'
+    merge-base:'find as good a common ancestor as possible for a merge'
+    name-rev:'find symbolic names for given revisions'
+    pack-redundant:'find redundant pack files'
+    rev-list:'list commit object in reverse chronological order'
+    show-index:'show packed archive index'
+    show-ref:'list references in a local repository'
+    unpack-file:'create temporary file with blob'\''s contents'
+    var:'show git logical variable'
+    verify-pack:'validate packed git archive files')
+
+  local -a plumbing_sync_commands
+  plumbing_sync_commands=(
+    daemon:'run a really simple server for git repositories'
+    fetch-pack:'receive missing objects from another repository'
+    http-backend:'run a server side implementation of Git over HTTP'
+    send-pack:'push objects over git protocol to another repository'
+    update-server-info:'update auxiliary information file to help dumb servers')
+
+  local -a plumbing_sync_helper_commands
+  plumbing_sync_helper_commands=(
+    http-fetch:'download from remote git repository via HTTP'
+    http-push:'push objects over HTTP/DAV to another repository'
+    parse-remote:'routines to help parsing remote repository access parameters'
+    receive-pack:'receive what is pushed into repository'
+    shell:'restricted login shell for GIT-only SSH access'
+    upload-archive:'send archive back to git-archive'
+    upload-pack:'send objects packed back to git fetch-pack')
+
+  local -a plumbing_internal_helper_commands
+  plumbing_internal_helper_commands=(
+    check-attr:'display gitattributes information'
+    check-ref-format:'ensure that a reference name is well formed'
+    fmt-merge-msg:'produce merge commit message'
+    mailinfo:'extract patch and authorship from a single email message'
+    mailsplit:'split mbox file into a list of files'
+    merge-one-file:'standard helper-program to use with git merge-index'
+    patch-id:'compute unique ID for a patch'
+    stripspace:'filter out empty lines')
+
+  integer ret=1
+  # TODO: Is this the correct way of doing it?
+  # TODO: Should we be chaining them together with || instead?
+  _describe -t main-porcelain-commands 'main porcelain command' main_porcelain_commands && ret=0
+  _describe -t ancillary-manipulator-commands 'ancillary manipulator command' ancillary_manipulator_commands && ret=0
+  _describe -t ancillary-interrogator-commands 'ancillary interrogator command' ancillary_interrogator_commands && ret=0
+  _describe -t interaction-commands 'interaction command' interaction_commands && ret=0
+  _describe -t plumbing-manipulator-commands 'plumbing manipulator command' plumbing_manipulator_commands && ret=0
+  _describe -t plumbing-interrogator-commands 'plumbing interrogator command' plumbing_interrogator_commands && ret=0
+  _describe -t plumbing-sync-commands 'plumbing sync command' plumbing_sync_commands && ret=0
+  _describe -t plumbing-sync-helper-commands 'plumbing sync helper command' plumbing_sync_helper_commands && ret=0
+  _describe -t plumbing-internal-helper-commands 'plumbing internal helper command' plumbing_internal_helper_commands && ret=0
+  return ret
+}
+
+(( $+functions[__git_aliases] )) ||
+__git_aliases () {
+  declare -a aliases
+
+  aliases=(${^${${(0)"$(_call_program aliases "git config -z --get-regexp '^alias.'")"}#alias.}/$'\n'/:alias for \'}\')
+
+  _describe -t aliases alias aliases $*
+}
+
+(( $+functions[__git_aliases_and_commands] )) ||
+__git_aliases_and_commands () {
+  _alternative \
+    'aliases::__git_aliases' \
+    'commands::_git_commands'
+}
+(( $+functions[__git_date_formats] )) ||
+__git_date_formats () {
+  declare -a date_formats
+
+  date_formats=(
+    relative:'show dates relative to the current time'
+    local:'show timestamps in local timezone'
+    iso:'show timestamps in ISO 8601 format'
+    rfc:'show timestamps in RFC 2822 format'
+    short:'show only date but not time'
+    raw:'show date in internal raw git format (%s %z)'
+    default:'show timestamp in the original timezone')
+
+  _describe -t date-formats 'date format' date_formats $*
+}
+
+(( $+functions[__git_gpg_secret_keys] )) ||
+__git_gpg_secret_keys () {
+  local expl
+
+  _wanted secret-keys expl 'secret key' compadd \
+    ${${(Mo)$(_call_program secret-keys gpg --list-secret-keys 2>/dev/null):%<*>}//(<|>)/}
+}
+
+(( $+functions[__git_merge_strategies] )) ||
+__git_merge_strategies () {
+  local expl
+  local -a merge_strategies
+
+  merge_strategies=(${=${${(M)${(f)"$(_call_program merge-strategies "git merge -s '' 2>&1")"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.})
+  __git_command_successful $pipestatus || return
+
+  _wanted merge-strategies expl 'merge strategy' compadd $* - $merge_strategies
+}
+
+(( $+functions[__git_encodings] )) ||
+__git_encodings () {
+  # TODO: Use better algorithm, as shown in iconv completer (separate it to a
+  # new Type).
+  local expl
+  _wanted encodings expl 'encoding' compadd "$@" \
+    -M 'm:{a-zA-Z}={A-Za-z} r:|-=* r:|=*' \
+    ${${${(f)"$(_call_program encodings iconv --list)"}## #}%//}
+}
+
+(( $+functions[__git_apply_whitespace_strategies] )) ||
+__git_apply_whitespace_strategies () {
+  declare -a strategies
+
+  strategies=(
+    'nowarn:turn off the trailing-whitespace warning'
+    'warn:output trailing-whitespace warning, but apply patch'
+    'fix:output trailing-whitespace warning and strip trailing whitespace'
+    'error:output trailing-whitespace warning and refuse to apply patch'
+    'error-all:same as "error", but output warnings for all files')
+
+  _describe -t strategies 'trailing-whitespace resolution strategy' strategies $*
+}
+
+(( $+functions[__git_remotes] )) ||
+__git_remotes () {
+  local remotes expl
+
+  remotes=(${(f)"$(_call_program remotes git remote 2>/dev/null)"})
+
+  _wanted remotes expl remote compadd $* - $remotes
 }
 
 (( $+functions[__git_ref_specs] )) ||
 __git_ref_specs () {
+  # TODO: This needs to deal with a lot more types of things.
   if compset -P '*:'; then
     __git_heads
   else
@@ -3123,1405 +4688,1337 @@ __git_ref_specs () {
       __git_heads
     else
       _alternative \
-       'tags:tag:__git_tags' \
-       'heads:head:__git_heads -qS :'
+       'commit-tags::__git_commit_tags' \
+       'heads::__git_heads -qS :'
     fi
   fi
 }
 
-(( $+functions[__git_signoff_file] )) ||
-__git_signoff_file () {
-  _alternative \
-    'signoffs:signoff:(yes true me please)' \
-    'files:signoff file:_files'
-}
+(( $+functions[__git_color_whens] )) ||
+__git_color_whens () {
+  local -a whens
 
-(( $+functions[__git_tag_ids] )) ||
-__git_tag_ids () {
+  whens=(
+    'always:always use colors'
+    'never:never use colors'
+    'auto:use colors if output is to a terminal')
+
+  _describe -t whens when whens $*
 }
 
-(( $+functions[__git_heads] )) ||
-__git_heads () {
-  local expl
-  declare -a branch_names
+(( $+functions[__git_ignore_submodules_whens] )) ||
+__git_ignore_submodules_whens () {
+  local -a whens
 
-  branch_names=(${${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname)"' refs/heads refs/remotes 2>/dev/null)"}#refs/(heads|remotes)/})
-  __git_command_successful || return
+  whens=(
+    none:'submodule is dirty when it contains untracked or modified files'
+    untracked:'submodule is dirty when it contains untracket files'
+    dirty:'ignore all changes to submodules, showing only changes to commits stored in superproject'
+    all:'ignore all changes to submodules (default)')
 
-  _wanted heads expl branch-name compadd $* - $branch_names HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD
+  _describe -t whens when whens $*
 }
 
-(( $+functions[__git_tags] )) ||
-__git_tags () {
+# (Currently) Command-specific Argument Types
+(( $+functions[__git_archive_formats] )) ||
+__git_archive_formats () {
   local expl
-  declare -a tag_names
 
-  tag_names=(${${(f)"$(_call_program tagrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
-  __git_command_successful || return
+  _wanted archive-formats expl 'archive format' \
+    compadd $* - ${${(f)"$(_call_program archive-formats git archive --list)"}}
+}
 
-  _wanted tags expl tag-name compadd $* - $tag_names
+(( $+functions[__git_compression_levels] )) ||
+__git_compression_levels () {
+  __git_config_values -t compression-levels -l 'compression level' -- "$current" "$parts[5]" \
+    '-1:default level of compression' \
+    '0:do not deflate files' \
+    '1:minimum compression' \
+    '2:a little more compression' \
+    '3:slightly more compression' \
+    '4:a bit more compression' \
+    '5:even more compression' \
+    '6:slightly even more compression' \
+    '7:getting there' \
+    '8:close to maximum compression' \
+    '9:maximum compression'
 }
 
-# TODO: depending on what options are on the command-line already, complete
-# only tags or heads
-# TODO: perhaps caching is unnecessary.  usually won’t contain that much data
-# TODO: perhaps provide alternative here for both heads and tags (and use
-# __git_heads and __git_tags)
-# TODO: instead of "./.", we should be looking in the repository specified as
-# an argument to the command (but default to "./." I suppose (why not "."?))
-(( $+functions[__git_references] )) ||
-__git_references () {
-#  _alternative \
-#    'heads::__git_heads' \
-#    'tags::__git_tags' && ret=0
-  local expl
+(( $+functions[__git_attributes] )) ||
+__git_attributes () {
+  local -a attributes
 
-  # TODO: deal with GIT_DIR
-  if [[ $_git_refs_cache_pwd != $PWD ]]; then
-    _git_refs_cache=(${${${(f)"$(_call_program references git ls-remote ./. 2>/dev/null)"}#*$'\t'}#refs/(heads|tags)/})
-    __git_command_successful || return
-    _git_refs_cache_pwd=$PWD
-  fi
+  attributes=(
+    'crlf:line-ending convention'
+    'ident:ident substitution'
+    'filter:filters'
+    'diff:textual diff'
+    'merge:merging strategy')
 
-  _wanted references expl 'references' compadd - $_git_refs_cache
+  _describe -t attributes attribute attributes $*
 }
 
-(( $+functions[__git_local_references] )) ||
-__git_local_references () {
-  local expl
-
-  if [[ $_git_local_refs_cache_pwd != $PWD ]]; then
-    _git_local_refs_cache=(${${${(f)"$(_call_program references git ls-remote ./. 2>/dev/null)"}#*$'\t'}#refs/})
-    __git_command_successful || return
-    _git_local_refs_cache_pwd=$PWD
-  fi
+(( $+functions[__git_daemon_service] )) ||
+__git_daemon_service () {
+  local -a services
 
-  _wanted references expl 'references' compadd - $_git_local_refs_cache
-}
+  services=(
+    'upload-pack:serve git fetch-pack and git ls-remote clients'
+    'upload-archive:serve git archive --remote clients')
 
-(( $+functions[__git_remote_references] )) ||
-__git_remote_references () {
-  __git_references
+  _describe -t services service services $*
 }
 
-(( $+functions[__git_branch_names] )) ||
-__git_branch_names () {
-  local expl
-  declare -a branch_names
+(( $+functions[__git_log_decorate_formats] )) ||
+__git_log_decorate_formats () {
+  declare -a log_decorate_formats
 
-  branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-  __git_command_successful || return
+  log_decorate_formats=(
+    short:'do not show ref name prefixes'
+    full:'show ref name prefixes'
+    no:'do not show ref names')
 
-  _wanted branch-names expl branch-name compadd $* - $branch_names
+  _describe -t log-decorate-formats 'log decorate format' log_decorate_formats $*
 }
 
-# TODO: Add merge.*.(name|driver|recursive) and diff.*.(command|funcname) (see
-# gitattributes(5)).
-(( $+functions[__git_config_name] )) ||
-__git_config_name () {
-  local label=names
+(( $+functions[__git_repository_permissions] )) ||
+__git_repository_permissions () {
+  if [[ -prefix [0-7] ]]; then
+    _message -e number 'numeric mode'
+  else
+    declare -a permissions
 
-  declare -a names
+    permissions=(
+      {umask,false,no,off}':use permissions reported by umask()'
+      {group,true,yes,on}':files and objects are group-writable'
+      {all,world,everybody}':files and objects are readable by all users and group-shareable')
 
-  if [[ -prefix alias.* ]]; then
-    _message 'command-alias name'
-  elif [[ -prefix branch.*.* ]]; then
-    compset -P 'branch.*.'
+    _describe -t permissions permission permissions $*
+  fi
+}
 
-    names=(
-      'remote:what remote git-fetch should fetch'
-      'merge:default refspec to be marked for merging')
-  elif [[ -prefix branch.* ]]; then
-    compset -P 'branch.'
+(( $+functions[__git_reflog_entries] )) ||
+__git_reflog_entries () {
+  local expl
+  declare -a reflog_entries
 
-    __git_branch_names -S '.' -r '.'
-    return
-  elif [[ -prefix remote.*.* ]]; then
-    compset -P 'remote.*.'
-
-    names=(
-      'url:URL of a remote repository'
-      'fetch:default set of refspecs for git-fetch'
-      'push:default set of refspecs for git-push'
-      'skipDefaultUpdate:whether to skip this remote when running git-remote'
-      'receivepack:default program to execute on remote when pushing'
-      'uploadpack:default program to execute on remote when fetching'
-      'tagopt:options for retrieving remote tags')
-  elif [[ -prefix remote.* ]]; then
-    compset -P 'remote.'
-
-    __git_remotes -S '.' -r '.'
-    return
-  elif [[ -prefix remotes.* ]]; then
-    compset -P 'remotes.'
+  reflog_entries=(${${${(f)"$(_call_program reflog-entries git reflog 2>/dev/null)"}#* }%%:*})
+  __git_command_successful $pipestatus || return
 
-    __git_remote-groups
-    return
-  elif [[ -prefix gitcvs.* ]]; then
-    names=(
-      'enabled:whether the cvs pserver interface is enabled'
-      'logfile:name of log file for cvs pserver'
-      'allbinary:whether to treat all files from CVS as binary')
+  if compset -P '*@'; then
+    reflog_entries=(${${(M)reflog_entries:#$IPREFIX*}#$IPREFIX})
+    _wanted reflog-entries expl 'reflog entry' compadd $* - $reflog_entries
+  else
+    reflog_entries=(${reflog_entries%@*})
+    _wanted reflog-entries expl 'reflog entry' compadd -qS @ $* - $reflog_entries
+  fi
+}
 
-    if [[ -prefix gitcvs.*.* ]]; then
-      compset -P 'gitcvs.*.'
+(( $+functions[__git_ref_sort_keys] )) ||
+__git_ref_sort_keys () {
+  compset -P '-'
 
-      label="gitcvs ${${words[CURRENT]#gitcvs.}%.*}-specific setting"
-    else
-      compset -P 'gitcvs.'
+  local -a sort_keys
 
-      label='gitcvs setting'
+  # TODO: numparent is undocumented.
+  sort_keys=(
+    'refname:the name of the ref'
+    'objecttype:the type of the object'
+    'objectsize:the size of the object'
+    'objectname:the object name (SHA-1)'
+    'tree:the tree header-field'
+    'parent:the parent header-field'
+    'numparent:undocumented'
+    'object:the object header-field'
+    'type:the type header-field'
+    'tag:the tag header-field'
+    'author:the author header-field'
+    'authorname:the name component of the author header-field'
+    'authoremail:the email component of the author header-field'
+    'authordate:the date component of the author header-field'
+    'committername:the name component of the committer header-field'
+    'committeremail:the email component of the committer header-field'
+    'committerdate:the date component of the committer header-field'
+    'taggername:the name component of the tagger header-field'
+    'taggeremail:the email component of the tagger header-field'
+    'taggerdate:the date component of the tagger header-field'
+    'creatorname:the name component of the creator header-field'
+    'creatordate:the date component of the creator header-field'
+    'subject:the subject of the message'
+    'body:the body of the message'
+    'body:the contents of the message (subject and body)')
 
-      names+=(
-        'dbname:name of database to use'
-        'dbdriver:name of DBI driver to use'
-        'dbuser:username to connect to database as'
-        'dbpass:password to use when connecting to database')
+  _describe -t sort-keys 'sort key' sort_keys $*
+}
 
-      declare -a suffixed_names
-      suffixed_names=(
-        'ext:ext-connection-method-specific settings'
-        'pserver:pserver-connection-method-specific settings')
+(( $+functions[__git_signoff_file] )) ||
+__git_signoff_file () {
+  _alternative \
+    'signoffs:signoff:(yes true me please)' \
+    'files:signoff file:_files'
+}
 
-      _describe -t suffixed-names 'gitcvs connection-specific setting' suffixed_names -M 'm:{a-zA-Z}={A-Za-z}' -M 'r:|.=* r:|=*' -S '.' -r '.' && ret=0
-    fi
-  elif [[ -prefix svn-remote.*.* ]]; then
-    compset -P 'svn.*.'
+(( $+functions[__git_stashes] )) ||
+__git_stashes () {
+  local expl
+  declare -a stashes
 
-    label="git-svn ${${words[CURRENT]#svn.}%.*}-specific setting"
+  stashes=(${${(f)"$(_call_program stashes git stash list 2>/dev/null)"}/: */})
+  __git_command_successful $pipestatus || return
 
-    names=(
-      'noMetadata:disable git-svn-id\: lines at end of commits (fetch, clone, dcommit, set-tree, rebase)'
-      'useSvmProps:whether to use remappings of URLs and UUIDs from mirrors (fetch, clone, dcommit, set-tree, rebase)'
-      'useSvnsyncProps:similar to useSvmProps, but for the svnsync command (fetch, clone, dcommit, set-tree, rebase)'
-      'rewriteRoot:alternate root URL to use')
+  _wanted stashes expl stash compadd $* - $stashes
+}
 
-  elif [[ -prefix svn-remote.* ]]; then
-    compset -P 'svn-remote.'
+(( $+functions[__git_svn_revisions] )) ||
+__git_svn_revisions () {
+  if [[ -prefix *: ]]; then
+    compset -P '*:'
 
-    __git_svn-remotes -M 'm:{a-zA-Z}={A-Za-z}' -M 'r:|.=* r:|=*' -S '.' -r '.' && ret=0
-    return
+    _alternative \
+      'revision-numbers::__git_svn_revision_numbers' \
+      'symbolic-revisions:symbolic revision:((HEAD:"the topmost revision of the SVN repository"))'
   else
-    names=(
-      'core.fileMode:whether differences in the executable bit is relevant'
-      'core.autocrlf:what type of conversion of CRLF'\''s git should do'
-      'core.symlinks:whether symlinks are treated as special files or not'
-      'core.gitProxy:command to execute to establish a connection to remote server'
-      'core.ignoreStat:whether modification times of files are ignored'
-      'core.preferSymlinkRefs:whether symbolic-reference files should be symlinks'
-      'core.bare:whether this repository has a working tree or not'
-      'core.logAllRefUpdates:whether to log updates of references'
-      'core.repositoryFormatVersion:internal variable determining the repository version'
-      'core.sharedRepository:what kind of sharing is done for this repository'
-      'core.warnAmbiguousRefs:whether to warn if a ref name is ambiguous'
-      'core.compression:level of compression to apply to packs'
-      'core.legacyheaders:whether to use the legacy object-header-format'
-      'core.packedGitWindowSize:size of mappings of pack files'
-      'core.packedGitLimit:maximum number of bytes to map from pack files'
-      'core.deltaBaseCacheLimit:maximum size of cache for base objects'
-      'apply.whitespace:default value for the --whitespace option to git-apply'
-      'color.branch:when to color output of git-branch'
-      'color.branch.current:color of the current branch'
-      'color.branch.local:color of a local branch'
-      'color.branch.remote:color of a remote branch'
-      'color.branch.plain:color of other branches'
-      'color.diff:when to color diff output'
-      'color.diff.plain:color of context text'
-      'color.diff.meta:color of metainformation'
-      'color.diff.frag:color of hunk headers'
-      'color.diff.old:color of removed lines'
-      'color.diff.new:color of added lines'
-      'color.diff.commit:color of commit headers'
-      'color.diff.whitespace:color of dubious whitespace'
-      'color.interactive:when to color in interactive mode'
-      'color.interactive.header:color of header'
-      'color.interactive.help:color of help'
-      'color.interactive.prompt:color of prompt'
-      'color.pager:whether the pager is fed colored output'
-      'color.status:when to color output of git-status'
-      'color.status.header:color of header text'
-      'color.status.added:color of added, but not yet committed, files'
-      'color.status.updated:color of updated, but not yet committed, files'
-      'color.status.changed:color of changed, but not yet added in the index, files'
-      'color.status.untracked:color of files not currently being tracked'
-      'commit.template:template file for commit messages'
-      'color.ui:when to color if output is capable; most generic option, overriding by more specific ones'
-      'diff.renameLimit:number of files to consider when detecting copy/renames'
-      'diff.renames:how hard to try to detect renames'
-      'fetch.unpackLimit:maximum number of objects to unpack when fetching'
-      'format.headers:additional email headers to include in email patches'
-      'format.suffix:default suffix for output files from git-format-patch'
-      'gc.packrefs:whether to allow git-gc to run git-pack-refs or not'
-      'gc.reflogexpire:default age for "git reflog expire"'
-      'gc.reflogexpireunreachable:default age for "git reflog expire" for unreachable'
-      'gc.rerereresolved:number of days to keep records of resolved merges'
-      'gc.rerereunresolved:number of days to keep records of unresolved merges'
-      'http.sslVerify:whether to verify the SSL certificate for HTTPS'
-      'http.sslCert:file containing SSL certificates for HTTPS'
-      'http.sslKey:file containing the SSL private key for HTTPS'
-      'http.sslCAInfo:file containing CA certificates to verify against for HTTPS'
-      'http.sslCAPath:path containing files with CA certificates to verify against for HTTPS'
-      'http.maxRequests:how many HTTP requests to launch in parallel'
-      'http.lowSpeedLimit:lower limit for HTTP transfer-speed'
-      'http.lowSpeedTime:duration for http.lowSpeedLimit'
-      'http.noEPSV:whether to disable the use of the EPSV ftp-command'
-      'i18n.commitEncoding:character encoding commit messages are stored in'
-      'i18n.logOutputEncoding:character encoding commit messages are output in'
-      'log.showroot:whether to show initial commit as a diff against an empty tree or not'
-      'merge.summary:whether to include summaries of merged commits'
-      'merge.tool:tool to use for merges (by git-mergetool)'
-      'merge.verbosity:amount of output shown by recursive merge strategy'
-      'pack.window:size of window used by git-pack-objects'
-      'pull.octopus:default merge strategy to use when pulling multiple branches'
-      'pull.twohead:default merge strategy to use when pulling a single branch'
-      'repack.usedeltabaseoffset:whether to allow git-repack to use delta-base offsets'
-      'show.difftree:default git-diff-tree options for git-show'
-      'showbranch.default:default set of branches for git-show-branch'
-      'tar.umask:umask to apply for git-tar-tree'
-      'user.email:email address used for commits'
-      'user.name:full name used for commits'
-      'user.signingkey:default GPG key to use when creating signed tags'
-      'whatchanged.difftree:default git-diff-tree arguments for git-whatchanged'
-      'receive.unpackLimit:maximum number of objects to unpack when pushing'
-      'receive.denyNonFastforwards:whether git-receive-pack denies ref updates which are not fast-forwards'
-      'transfer.unpackLimit:default value for fetch.unpackLimit and receive.unpackLimit'
-      'imap.Folder:IMAP folder to use with git-imap-send'
-      'imap.Tunnel:tunneling command to use for git-imap-send'
-      'imap.Host:host git-imap-send should connect to'
-      'imap.User:user git-imap-send should log in as'
-      'imap.Pass:password git-imap-send should use when logging in'
-      'imap.Port:port git-imap-send should connect on'
-      'instaweb.local:whether instaweb should bind to 127.0.0.1'
-      'instaweb.httpd:HTTP-daemon command-line to execute for instaweb'
-      'instaweb.port:port to bind HTTP daemon to for instaweb'
-      'instaweb.browser:web-browser command-line to execute for instaweb'
-      'instaweb.modulepath:module path for the Apache HTTP-daemon for instaweb'
-      'svn.noMetadata:disable git-svn-id\: lines at end of commits (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.useSvmProps:whether to use remappings of URLs and UUIDs from mirrors (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.useSvnsyncProps:similar to useSvmProps, but for the svnsync command (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.followparent:whether to follow parent commit (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.authorsfile:default authors file to use (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.username:username to use for SVN transport (fetch, clone, dcommit, set-tree, rebase, init)'
-      'svn.configdir:configuration directory to use (fetch, clone, dcommit, set-tree, rebase, init)'
-      'svn.noauthcache:undocumented (fetch, clone, dcommit, set-tree, rebase, init)'
-      'svn.quiet:make git-svn less verbose (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.repack:repack files (for given number of revisions) (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.repackflags:flags to pass to git-repack (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.logwindowsize:undocumented (fetch, clone, dcommit, set-tree, rebase)'
-      'svn.shared:share repository amongst several users (init, clone)'
-      'svn.template:directory to use as a template for the object database (init, clone)'
-      'svn.trunk:trunk sub-directory to use (init, clone)'
-      'svn.tags:tags sub-directory to use (init, clone)'
-      'svn.branches:branches sub-directory to use (init, clone)'
-      'svn.prefix:prefix to use for names on remotes (init, clone)'
-      'svn.rmdir:remove empty directories from SVN tree after commit (dcommit, set-tree, commit-diff)'
-      'svn.edit:edit commit message before committing (dcommit, set-tree, commit-diff)'
-      'svn.findcopiesharder:try harder to find copies (dcommit, set-tree, commit-diff)'
-      'svn.l:limit number of rename/copy targets to run (dcommit, set-tree, commit-diff)'
-      'svn.copysimilarity:undocumented (dcommit, set-tree, commit-diff)'
-      'svn.revision:only use given revision or revision range (fetch, clone, show-ignore, log, commit-diff)'
-      'svn.merge:use merging strategies, if necessary (dcommit, rebase)'
-      'svn.fetch-all:undocumented (fetch, dcommit, rebase)'
-      'svn.stdin:read list of commits to commit from stdin (set-tree)'
-      'svn.strategy:use given merge strategy (dcommit, rebase)'
-      'svn.verbose:output extra information (dcommit, log, rebase)'
-      'svn.dryrun:output git-commands that would show diffs that would be committed (dcommit)'
-      'svn.minimize:undocumented (migrate)'
-      'svn.limit:like --max-count, but not counting merged/excluded commits (log)'
-      'svn.incremental:give output suitable for concatenation (log)'
-      'svn.showcommit:output git commit SHA-1, as well (log)'
-      'svn.oneline:similar to --pretty=oneline (log)'
-      'svn.color:undocumented (log)'
-      'svn.pager:undocumented (log)'
-      'svn.nonrecursive:undocumented (log)'
-      'svn.local:undocumented (rebase)'
-      'svn.message:undocumented (commit-diff)'
-      'svn.file:(commit-diff) undocumented')
-
-    declare -a suffixed_names
-
-    suffixed_names=(
-      'alias:command aliases'
-      'branch:prefix for branch-specific variables'
-      'remote:prefix for remote-repository variables'
-      'remotes:prefix for remote-groups'
-      'gitcvs:prefix for git-cvsserver-specific variables'
-      'svn-remote:prefix for git-svn remote-repository variables')
-
-    _describe -t suffixed-names 'special name' suffixed_names -M 'm:{a-zA-Z}={A-Za-z}' -M 'r:|.=* r:|=*' -S '.' -r '.' && ret=0
+    _alternative \
+      'revision-numbers::__git_svn_revision_numbers' \
+      'symbolic-revisions:symbolic revision:__git_svn_base_revisions'
   fi
+}
 
-  _describe -t names $label names -M 'm:{a-zA-Z}={A-Za-z}' -M 'r:|.=* r:|=*' && ret=0
+(( $+functions[__git_svn_base_revisions] )) ||
+__git_svn_base_revisions () {
+  declare -a symbolic_revisions
+
+  symbolic_revisions=(
+    'BASE:the bottommost revision of the SVN repository')
+
+  # TODO: How do we deal with $*?
+  _describe -t symbolic-revisions 'symbolic revision' symbolic_revisions -S ':' -r ': '
 }
 
-(( $+functions[__git_config_gettable_name] )) ||
-__git_config_gettable_name () {
+# Object Type Argument Types
+
+(( $+functions[__git_branch_names] )) ||
+__git_branch_names () {
   local expl
-  declare -a names
+  declare -a branch_names
 
-  # TODO: This is strictly not correct, as names can have equal signs in them
-  # as well.  However, there’s no good way to tell from the output of
-  # git-config, so this’ll have to do until we write our own .git/config
-  # parser (which will never happen because it’s not worth the trouble).
-  names=(${${(f)"$(_call_program names git config --list)"}%%\=*})
-  __git_command_successful || return
+  branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+  __git_command_successful $pipestatus || return
 
-  _wanted names expl 'names' compadd $names
+  _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-(( $+functions[__git_config_filtered_gettable_name] )) ||
-__git_config_filtered_gettable_name () {
+(( $+functions[__git_remote_branch_names] )) ||
+__git_remote_branch_names () {
   local expl
-  declare -a names
+  declare -a branch_names
 
-  # TODO: See __git_config_gettable_name for discussion on how to actually get
-  # out the names, skipping the values.
-  names=(${${(M)${${(f)"$(_call_program $2 git config --list)"}%%\=*}:#$1.*}#$1.})
-  __git_command_successful || return
+  branch_names=(${${(f)"$(_call_program remote-branch-refs git for-each-ref --format='%(refname)' refs/remotes 2>/dev/null)"}#refs/remotes/})
+  __git_command_successful $pipestatus || return
 
-  _wanted $2 expl $3 compadd $names
+  _wanted remote-branch-names expl 'remote branch name' compadd $* - $branch_names
 }
 
-(( $+functions[__git_remote-groups] )) ||
-__git_remote-groups () {
-  __git_config_filtered_gettable_name 'remotes' remote-groups 'remote-groups'
+(( $+functions[__git_commits] )) ||
+__git_commits () {
+  # TODO: deal with things that __git_heads and __git_tags has in common (i.e.,
+  # if both exists, they need to be completed to heads/x and tags/x.
+  _alternative \
+    'heads::__git_heads' \
+    'commit-tags::__git_commit_tags' \
+    'commit-objects::__git_commit_objects'
 }
 
-(( $+functions[__git_svn-remotes] )) ||
-__git_svn-remotes () {
-  local expl
-  declare -a names
+(( $+functions[__git_heads] )) ||
+__git_heads () {
+  local gitdir expl start
+  declare -a heads
 
-  # TODO: See __git_config_gettable_name for discussion on how to actually get
-  # out the names, skipping the values.
-  names=(${${${(M)${${(f)"$(_call_program $2 git config --list)"}%%\=*}:#svn-remote.*}#svn-remote.}%%.*})
-  __git_command_successful || return
+  heads=(${${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname)"' refs/heads refs/remotes 2>/dev/null)"}#refs/(heads|remotes)/})
+  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+  if __git_command_successful $pipestatus; then
+    for f in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+      [[ -f $gitdir/$f ]] && heads+=$f
+    done
+  fi
 
-  _wanted svn-remotes expl 'svn remote' compadd $names
+  _wanted heads expl head compadd $* - $heads
 }
 
-# TODO: It’d be really cool if both the default and the current value could be
-# shown for all values.
-(( $+functions[__git_config_values] )) ||
-__git_config_values () {
-  local compadd_opts
+(( $+functions[__git_commit_objects] )) ||
+__git_commit_objects () {
+  _guard '[[:xdigit:]](#c,40)' 'commit object name'
+}
 
-  zparseopts -D -E -a compadd_opts M: J: V: 1 2 n F: X:
+(( $+functions[__git_blob_objects] )) ||
+__git_blob_objects () {
+  _guard '[[:xdigit:]](#c,40)' 'blob object name'
+}
 
-  case $1 in
-    ((#i)core.fileMode)
-      declare -a booleans
+(( $+functions[__git_blobs] )) ||
+__git_blobs () {
+  _alternative \
+    'blob-tags::__git_blob_tags' \
+    'blob-objects::__git_blob_objects'
+}
 
-      booleans=(
-        {true,yes}':track changes to executable bit of files'
-        {false,no}':ignore changes to executable bit of files')
+(( $+functions[__git_blobs_and_trees_in_treeish] )) ||
+__git_blobs_and_trees_in_treeish () {
+  compset -P '*:'
+  [[ -n ${IPREFIX} ]] || return 1
+  if [[ -n ${IPREFIX%:} ]]; then
+    __git_is_treeish ${IPREFIX%:} && __git_tree_files ${PREFIX:-.} ${IPREFIX%:}
+  else
+    __git_changed-in-index_files
+  fi
+}
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.autocrlf)
-      declare -a modes
+(( $+functions[__git_committishs] )) ||
+__git_committishs () {
+  __git_commits
+}
 
-      modes=(
-        {true,yes}':convert CRLF to LF when reading and LF to CRLF when writing'
-        {false,no}':leave CRLF at the end of lines in text files as is'
-        'input:convert CRLF to LF when reading')
+(( $+functions[__git_revisions] )) ||
+__git_revisions () {
+  # TODO: deal with prefixes and suffixes listed in git-rev-parse
+  __git_commits $*
+}
 
-      _describe -t crlfmode 'crlf mode' modes
-      ;;
-    ((#i)core.symlinks)
-      declare -a booleans
+(( $+functions[__git_commits2] )) ||
+__git_commits2 () {
+  compset -P '\\\^'
+  __git_commits
+}
 
-      booleans=(
-        {true,yes}':record symlink files as such'
-        {false,no}':check out symlinks as plain files that contain the link text')
+(( $+functions[__git_commit_ranges] )) ||
+__git_commit_ranges () {
+  if compset -P '*..(.|)'; then
+    __git_commits $*
+  else
+    __git_commits $* -qS ..
+  fi
+}
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.gitProxy)
-      _message 'proxy command'
-      ;;
-    ((#i)core.ignoreStat)
-      declare -a booleans
+(( $+functions[__git_commit_ranges2] )) ||
+__git_commit_ranges2 () {
+  _alternative \
+    'commits::__git_commits2' \
+    'ranges::__git_commit_ranges'
+}
 
-      booleans=(
-        {true,yes}':working-copy files are unchanged until marked as changed'
-        {false,no}':use lstat() to determine if a file has changed')
+(( $+functions[__git_trees] )) ||
+__git_trees () {
+  __git_objects
+}
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.preferSymlinkRefs)
-      declare -a booleans
+(( $+functions[__git_tree_ishs] )) ||
+__git_tree_ishs () {
+  __git_commits
+}
 
-      booleans=(
-        {true,yes}':use symbolic links for symbolic reference files'
-        {false,no}':use "symref" files for symbolic reference files')
+(( $+functions[__git_objects] )) ||
+__git_objects () {
+  compset -P '*:'
+  if [[ -n $IPREFIX ]]; then
+    __git_tree_files "$PREFIX" "${IPREFIX%:}"
+  else
+    _alternative \
+      'revisions::__git_revisions' \
+      'files::__git_cached_files'
+  fi
+}
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.bare)
-      declare -a booleans
+(( $+functions[__git_submodules] )) ||
+__git_submodules () {
+  local expl
+  declare -a submodules
 
-      booleans=(
-        {true,yes}':the repository does not have a working directory'
-        {false,no}':the repository has a working directory')
+  submodules=(${${(f)"$(_call_program submodules git submodule 2>/dev/null)"}#* })
+  __git_command_successful $pipestatus || return
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.logAllRefUpdates)
-      declare -a booleans
+  _wanted submodules expl submodule compadd $* - $submodules
+}
 
-      booleans=(
-        {true,yes}':create ref files for branch heads'
-        {false,no}':don'\''t automatically create ref files')
+# Tag Argument Types
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.repositoryFormatVersion)
-      _message 'repository format version string (internal)'
-      ;;
-    ((#i)core.sharedRepository)
-      __git_repository_permissions
-      ;;
-    ((#i)core.warnAmbiguousRefs)
-      declare -a booleans
+(( $+functions[__git_tags] )) ||
+__git_tags () {
+  local expl
+  declare -a tags
 
-      booleans=(
-        {true,yes}':warn if a ref name matches multiple refs'
-        {false,no}':ignore ambiguous ref names')
+  tags=(${${(f)"$(_call_program tagrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
+  __git_command_successful $pipestatus || return
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.compression)
-      declare -a levels
-
-      levels=(
-        '-1:default level of compression'
-        '0:do not deflate files'
-        '1:minimum compression'
-        '2:a little more compression'
-        '3:slightly more compression'
-        '4:a bit more compression'
-        '5:even more compression'
-        '6:slightly even more compression'
-        '7:getting there'
-        '8:close to maximum compression'
-        '9:maximum compression')
-
-      _describe -t compression-level 'compression level' levels
-      ;;
-    ((#i)core.legacyheaders)
-      declare -a booleans
+  _wanted tags expl tag compadd $* - $tags
+}
 
-      booleans=(
-        {true,yes}':use compatiblity format for loose objects'
-        {false,no}':use new, more efficient, format for loose objects')
+(( $+functions[__git_commit_tags] )) ||
+__git_commit_tags () {
+  __git_tags_of_type commit $*
+}
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)core.(packedGit(WindowSize|Limit)|deltaBaseCacheLimit))
-      _guard '[[:digit:]]#([kmg]|)' 'number of bytes'
-      ;;
-    ((#i)alias.*)
-      _message 'git sub-command with arguments'
-      ;;
-    ((#i)apply.whitespace)
-      __git_apply_whitespace_strategies
-      ;;
-    ((#i)branch.*.remote)
-      __git_remotes
-      ;;
-    ((#i)branch.*.merge)
-      __git_references
-      ;;
-    ((#i)color.(branch|diff|pager|status))
-      declare -a booleans
+(( $+functions[__git_blob_tags] )) ||
+__git_blob_tags () {
+  __git_tags_of_type blob $*
+}
 
-      booleans=(
-        {always,true}':always output in color'
-        {never,false}':never output in color'
-        'auto:output in color if to a terminal')
+(( $+functions[__git_tags_of_type] )) ||
+__git_tags_of_type () {
+  local type expl
+  declare -a tags
 
-      _describe -t boolean 'boolean' booleans
-      ;;
-    ((#i)color.*.*)
-      compset -P '* '
+  type=$1; shift
 
-      case ($words[CURRENT]) in
-        (?*' '?*' '*)
-          if [[ $words[CURRENT] == *(bold|dim|ul|blink|reverse)* ]]; then
-            __git_colors
-          else
-            __git_color_attributes
-          fi
-          ;;
-        (*)
-          local suffix q_flag
-          if [[ $words[CURRENT] == [\"\']* ]]; then
-            suffix=' '
-            q_flag=-q
-          else
-            suffix='\ '
-          fi
+  tags=(${${(M)${(f)"$(_call_program $type-tag-refs "git for-each-ref --format='%(*objecttype)%(objecttype) %(refname)' refs/tags 2>/dev/null")"}:#$type(tag|) *}#$type(tag|) refs/tags/})
+  __git_command_successful $pipestatus || return
 
-          if [[ $words[CURRENT] == *(bold|dim|ul|blink|reverse)* ]]; then
-            __git_colors -S $suffix $q_flag
-          else
-            _alternative \
-              'colors:color:__git_colors -S $suffix $q_flag' \
-              'attributes:attribute:__git_color_attributes -S $suffix $q_flag'
-          fi
-          ;;
-      esac
-      ;;
-    ((#i)diff.renameLimit)
-      _guard "[[:digit:]]#" number
-      ;;
-    ((#i)diff.renames)
-      declare -a settings
+  _wanted $type-tags expl "$type tag" compadd $* - $tags
+}
 
-      settings=(
-        {true,yes}':enable basic rename detection'
-        {false,no}':don'\''t try to detect renames'
-        {copies,copy}':detect file renames and copies')
+(( $+functions[__git_tag_ids] )) ||
+__git_tag_ids () {
+}
 
-      _describe -t values 'rename-detection setting' settings
-      ;;
-    ((#i)(fetch|receive|transfer).unpackLimit)
-      _guard "[[:digit:]]#" 'maximum number of objects to unpack'
-      ;;
-    ((#i)format.headers)
-      _message 'email header'
-      ;;
-    ((#i)format.suffix)
-      _message 'filename suffix'
-      ;;
-    ((#i)gc.packrefs)
-      declare -a values
+# Reference Argument Types
 
-      values=(
-        {true,yes}':pack references when collecting garbage'
-        {false,no}':leave references alone when collecting garbage'
-        'notbare:pack references if the repository has a working directory')
+(( $+functions[__git_references] )) ||
+__git_references () {
+  local expl
 
-      _describe -t values 'value' values
-      ;;
-    ((#i)gc.(reflogexpire(unreachable|)|rerere(un|)resolved))
-      # TODO: It would be nice if the default value was shown under a separate
-      # description/tag.
-      __git_datetimes
-      ;;
-    ((#i)gitcvs.(*.|)enabled)
-      declare -a booleans
+  # TODO: depending on what options are on the command-line already, complete
+  # only tags or heads
+  # TODO: perhaps caching is unnecessary.  usually won’t contain that much data
+  # TODO: perhaps provide alternative here for both heads and tags (and use
+  # __git_heads and __git_tags)
+  # TODO: instead of "./.", we should be looking in the repository specified as
+  # an argument to the command (but default to "./." I suppose (why not "."?))
+  # TODO: deal with GIT_DIR
+  if [[ $_git_refs_cache_pwd != $PWD ]]; then
+    _git_refs_cache=(${${${(f)"$(_call_program references git ls-remote ./. 2>/dev/null)"}#*$'\t'}#refs/(heads|tags)/})
+    __git_command_successful $pipestatus || return
+    _git_refs_cache_pwd=$PWD
+  fi
 
-      booleans=(
-        {true,yes}':enable the cvs server interface'
-        {false,no}':don'\''t enable the cvs server interface')
+  _wanted references expl 'references' compadd - $_git_refs_cache
+}
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)gitcvs.(*.|)logfile)
-      _files
-      ;;
-    ((#i)gitcvs.(*.|)allbinary)
-      declare -a booleans
+(( $+functions[__git_local_references] )) ||
+__git_local_references () {
+  local expl
 
-      booleans=(
-        {true,yes}':tell the client to treat all files as binary'
-        {false,no}':treat files normally')
+  if [[ $_git_local_refs_cache_pwd != $PWD ]]; then
+    _git_local_refs_cache=(${${${(f)"$(_call_program references git ls-remote ./. 2>/dev/null)"}#*$'\t'}#refs/})
+    __git_command_successful $pipestatus || return
+    _git_local_refs_cache_pwd=$PWD
+  fi
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)gitcvs.dbname)
-      # TODO: In the future, when computers are self-aware and this won’t
-      # really matter anymore, one could inspect what gitcvs.dbdriver is set to
-      # and complete possible databases for that DBI driver.
-      _message -e 'database name'
-      ;;
-    ((#i)gitcvs.dbdriver)
-      declare -a drivers
+  _wanted references expl 'references' compadd - $_git_local_refs_cache
+}
 
-      # TODO: Would be nice to only include those that are installed, but I
-      # couldn’t figure out a good way of doing that when I wrote this code.
-      drivers=(
-        'SQLite:use the SQLite database driver (default)'
-        'Pg:use the Pg database driver')
+(( $+functions[__git_remote_references] )) ||
+__git_remote_references () {
+  __git_references
+}
 
-      _describe -t dbi-drivers 'DBI driver' drivers
-      ;;
-    ((#i)gitcvs.dbuser)
-      local expl
+(( $+functions[__git_note_references] )) ||
+__git_local_references () {
+  local references expl
 
-      _description users expl 'database user'
-      _users $expl
-      ;;
-    ((#i)gitcvs.dbpass)
-      _message -e 'database password'
-      ;;
-    ((#i)http.sslVerify)
-      declare -a booleans
+  references=(${${(M)${${(f)"$(_call_program references git ls-remote ./. 2>/dev/null)"}#*$'\t'}:#refs/notes/*}#refs/notes/})
+  __git_command_successful $pipestatus || return
 
-      booleans=(
-        {true,yes}':verify SSL certificates when fetching or pushing over HTTP'
-        {false,no}':skip verification of SSL certificates')
+  _wanted references expl reference compadd - $references
+}
+(( $+functions[__git_notes_refs] )) ||
+__git_notes_refs () {
+  local expl
+  declare -a notes_refs
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)http.sslCert)
-      local expl
+  notes_refs=(${${(f)"$(_call_program notes-refs git for-each-ref --format='"%(refname)"' refs/notes 2>/dev/null)"}#$type refs/notes/})
+  __git_command_successful $pipestatus || return
 
-      _wanted files expl 'SSL certificate file' _files
-      ;;
-    ((#i)http.sslKey)
-      local expl
+  _wanted notes-refs expl "notes ref" compadd $* - $notes_refs
+}
 
-      _wanted files expl 'SSL private-key file' _files
-      ;;
-    ((#i)http.sslCAInfo)
-      local expl
+# File Argument Types
 
-      _wanted files expl 'certificates file' _files
-      ;;
-    ((#i)http.sslCAPath)
-      local expl
+(( $+functions[__git_files_relative] )) ||
+__git_files_relative () {
+  local rawfiles files file f_parts prefix p_parts tmp
 
-      _wanted files expl 'CA certificates file' _files
-      ;;
-    ((#i)http.maxRequests)
-      _guard "[[:digit:]]#" 'maximum number of requests'
-      ;;
-    ((#i)http.lowSpeedLimit)
-      # TODO: Need a better description
-      _guard "[[:digit:]]#([kmg]|)" number
-      ;;
-    ((#i)http.lowSpeedTime)
-      _guard "[[:digit:]]#" seconds
-      ;;
-    ((#i)http.noEPSV)
-      declare -a booleans
+  prefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null)
+  __git_command_successful $pipestatus || return
 
-      booleans=(
-        {true,yes}':don'\''t use EPSV mode over FTP (for stupid servers)'
-        {false,no}':use EPSV mode over FTP')
+  # Empty prefix, no modifications
+  if (( $#prefix == 0 )); then
+    print $1
+    return
+  fi
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)i18n.(commitEncoding|logOutputEncoding))
-      __git_encodings
-      ;;
-    ((#i)log.showroot)
-      declare -a booleans
+  rawfiles=(${(0)1})
+  files=()
 
-      booleans=(
-        {true,yes}':show initial commit as a diff against an empty tree'
-        {false,no}':hide initial commit')
+  # Now we assume that we've given "absolute" paths list with "root"
+  # being repository top directory.  $prefix is also "absolute" path.
+  for file in $rawfiles; do
+    # Collapse "/./" and "//", strip "/." and "/" from tail (I know,
+    # this is a bit paranoid).
+    f_parts=(${(s:/:)"${${${${file//\/\///}//\/.\///}%%/.}%%/}"})
+    p_parts=(${(s:/:)"${${${${prefix//\/\///}//\/.\///}%%/.}%%/}"})
+    tmp=()
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)merge.summary)
-      declare -a booleans
+    # Strip common path prefix.
+    while (( $#f_parts > 0 )) && (( $#p_parts > 0 )) && [[ $f_parts[1] == $p_parts[1] ]]; do
+      f_parts[1]=()
+      p_parts[1]=()
+    done
 
-      # TODO: Use (default) in more descriptions.
-      booleans=(
-        {true,yes}':include summaries in merge commit messages'
-        {false,no}':don'\''t add summaries to merge commit messages (default)')
+    # If prefix still not empty, ascend up.
+    while (( $#p_parts > 0 )); do
+      tmp+=..
+      p_parts[1]=()
+    done
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)merge.tool)
-      declare -a tools
+    # Add remaining path.
+    tmp+=($f_parts)
 
-      tools=(kdiff3 tkdiff meld xxdiff emerge vimdiff)
+    files+=${(j:/:)tmp}
+  done
 
-      _describe -t merge-tools 'merge tool' tools
-      ;;
-    ((#i)merge.verbosity)
-      declare -a levels
+  print ${(pj:\0:)files}
+}
 
-      levels=(
-        '0:only final error message if conflicts were detected'
-        '1:conflicts'
-        '2:conflicts and file changes'
-        '5:debugging information')
+(( $+functions[__git_files] )) ||
+__git_files () {
+  local compadd_opts opts tag description gitdir gitcdup files expl
 
-      _describe -t verbosity-levels 'verbosity level' levels
-      ;;
-    ((#i)pack.window)
-      _guard '[[:digit:]]#' 'window size'
-      ;;
-    ((#i)pull.(octopus|twohead))
-      __git_merge_strategies
-      ;;
-    ((#i)remote.*.url)
-      _urls
-      ;;
-    ((#i)remote.*.fetch)
-      : TODO
-      ;;
-    ((#i)remote.*.push)
-      : TODO
-      ;;
-    ((#i)remote.*.skipDefaultUpdate)
-      declare -a booleans
+  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
+  zparseopts -D -E -a opts -- -cached -deleted -modified -others -ignored -unmerged -killed x+: --exclude+:
+  tag=$1 description=$2; shift 2
 
-      booleans=(
-        {true,yes}':skip this remote by default'
-        {false,no}':update this remote by default')
+  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+  __git_command_successful $pipestatus || return
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)remote.*.(receivepack|uploadpack))
-      # TODO: Perhaps actually use SSH here?
-      local expl
+  gitcdup=$(_call_program gitcdup git rev-parse --show-cdup 2>/dev/null)
+  __git_command_successful $pipestatus || return
 
-      _wanted files expl "remote git-${${1##*.}%pack}-pack program" _files -g *(*)
-      ;;
-    ((#i)remote.*.tagopt)
-      declare -a opts
+  opts+='--exclude-per-directory=.gitignore'
+  [[ -f "$gitdir/info/exclude" ]] && opts+="--exclude-from=$gitdir/info/exclude"
 
-      opts=(
-        '--no-tags:don'\''t fetch tags automatically'
-        '"":fetch tags as usual')
+  files=$(_call_program files git ls-files -z --full-name $opts -- $gitcdup 2>/dev/null)
+  __git_command_successful $pipestatus || return
+  files=(${(0)"$(__git_files_relative $files)"})
+  __git_command_successful $pipestatus || return
 
-      _describe -t tag-options 'tag retrieval' opts
-      ;;
-    ((#i)remotes.*)
-      compset -P '* '
+  _wanted $tag expl $description _multi_parts $compadd_opts - / files
+}
 
-      local suffix
-      if [[ $words[CURRENT] == [\"\']* ]]; then
-        suffix=' '
-      else
-        suffix='\ '
-      fi
+(( $+functions[__git_cached_files] )) ||
+__git_cached_files () {
+  __git_files --cached cached-files 'cached file' $*
+}
 
-      # TODO: Should really only complete unique remotes, that is, not the same
-      # remote more than once in the list.
-      __git_remotes -S $suffix -q
-      ;;
-    ((#i)repack.usedeltabaseoffset)
-      declare -a booleans
+(( $+functions[__git_deleted_files] )) ||
+__git_deleted_files () {
+  __git_files --deleted deleted-files 'deleted file' $*
+}
 
-      booleas=(
-        {true,yes}':allow creation of delta-base-offset packs'
-        {false,no}':don'\''t create delta-base-offset packs')
+(( $+functions[__git_modified_files] )) ||
+__git_modified_files () {
+  __git_files --modified modified-files 'modified file' $*
+}
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)show.difftree)
-      # TODO: This should complete the options available to these two commands.
-      _message 'default options to git-diff-tree and git-show'
-      ;;
-    ((#i)showbranch.default)
-      __git_branch_names
-      ;;
-    ((#i)tar.umask)
-      _alternative \
-        'number: :_guard "[0-7]#" "numeric mode"' \
-        'values:special value:((user:"use user'\''s current umask"))'
-      ;;
-    ((#i)user.email)
-      _email_addresses
-      ;;
-    ((#i)user.name)
-      _users
-      ;;
-    ((#i)user.signingkey)
-      __git_gpg_secret_keys
-      ;;
-    ((#i)whatchanged.difftree)
-      # TODO: This should complete the options available to git-diff-tree.
-      _message 'default options to git-diff-tree when invoking git-whatchanged'
-      ;;
-    ((#i)receive.denyNonFastForwards)
-      declare -a booleans
+(( $+functions[__git_other_files] )) ||
+__git_other_files () {
+  __git_files --others untracked-files 'untracked file' $*
+}
 
-      booleans=(
-        {true,yes}':git-receive-pack will deny a ref update that isn'\''t a fast forward'
-        {false,no}':allow a ref update that isn'\''t a fast forward')
+(( $+functions[__git_ignored_cached_files] )) ||
+__git_ignored_cached_files () {
+  __git_files --ignored --cached ignored-cached-files 'ignored cached file' $*
+}
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)imap.folder)
-      _mailboxes
-      ;;
-    ((#i)imap.tunnel)
-      _message -e commands 'imap tunneling command'
-      ;;
-    ((#i)imap.host)
-      _hosts
-      ;;
-    ((#i)imap.user)
-      # TODO: If imap.host is set, complete users on that system?
-      _users
-      ;;
-    ((#i)imap.pass)
-      _message -e passwords 'imap password'
-      ;;
-    ((#i)imap.port)
-      _ports
-      ;;
-    ((#i)instaweb.local)
-      declare -a booleans
+(( $+functions[__git_ignored_other_files] )) ||
+__git_ignored_other_files () {
+  __git_files --ignored --others ignored-untracked-files 'ignored untracked file' $*
+}
 
-      booleans=(
-        {true,yes}':bind the HTTP daemon to 127.0.0.1'
-        {false,no}':don'\''t bind the HTTP daemon to a specific address')
+(( $+functions[__git_unmerged_files] )) ||
+__git_unmerged_files () {
+  __git_files --unmerged unmerged-files 'unmerged file' $*
+}
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)instaweb.httpd)
-      _message -e command-lines 'HTTP-daemon command-line'
-      ;;
-    ((#i)instaweb.port)
-      _ports
-      ;;
-    ((#i)instaweb.browser)
-      _message -e command-lines 'web-browser command-line'
-      ;;
-    ((#i)instaweb.modulepath)
-      local expl
+(( $+functions[__git_killed_files] )) ||
+__git_killed_files () {
+  __git_files --killed killed-files 'killed file' $*
+}
 
-      _description directories expl 'module path'
-      _directories $expl
-      ;;
-    ((#i)(svn.|svn-remote.*.)noMetaData)
-      declare -a booleans
+(( $+functions[__git_changed-in-index_files] )) ||
+__git_changed-in-index_files () {
+  local files expl
 
-      booleans=(
-        {true,yes}':disable git-svn-id: lines at end of commits'
-        {false,no}':add git-svn-id: lines at end of commits')
+  files=$(_call_program files git diff-index -z --name-only --no-color --cached HEAD 2>/dev/null)
+  __git_command_successful $pipestatus || return
+  files=(${(0)"$(__git_files_relative $files)"})
+  __git_command_successful $pipestatus || return
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)(svn.|svn-remote.*.)(useSvmProps|useSvnsyncProps))
-      declare -a booleans
+  _wanted changed-in-index-files expl 'changed in index file' _multi_parts $@ - / files
+}
 
-      booleans=(
-        {true,yes}':remap URLs and UUIDs for mirrors'
-        {false,no}':don'\''t remap URLs and UUIDs for mirrors')
+(( $+functions[__git_changed-in-working-tree_files] )) ||
+__git_changed-in-working-tree_files () {
+  local files expl
 
-      _describe -t booleans 'boolean' booleans
-      ;;
-    ((#i)svn.followparent)
-      __git_boolean_settings true 'follow parent commit'
-      ;;
-    ((#i)svn.authorsfile)
-      local expl
+  files=$(_call_program changed-in-working-tree-files git diff -z --name-only --no-color 2>/dev/null)
+  __git_command_successful $pipestatus || return
+  files=(${(0)"$(__git_files_relative $files)"})
+  __git_command_successful $pipestatus || return
 
-      _description files expl 'authors-conversion file'
-      _files $expl
-      ;;
-    ((#i)svn.username)
-      _users
-      ;;
-    ((#i)svn.configdir)
-      _directories
-      ;;
-    ((#i)svn.noauthcache)
-      # TODO: Update description once this gets documented.
-      __git_boolean_settings false 'use auth cache'
-      ;;
-    ((#i)svn.quiet)
-      __git_boolean_settings false 'make git-svn less verbose' 'let git-svn produce verbose output'
-      ;;
-    ((#i)svn.repack)
-      _guard '[[:digit:]]#' 'revision limit'
-      ;;
-    ((#i)svn.repackflags)
-      # TODO: Should complete git-repack arguments
-      _message -e 'git-repack flags'
-      ;;
-    ((#i)svn.logwindowsize)
-      # TODO: Update description once this gets documented.
-      _guard '[[:digit:]]#' 'log-window size'
-      ;;
-    ((#i)svn.shared)
-      __git_repository_permissions
-      ;;
-    ((#i)svn.template)
-      # NOTE: This is of course ridiculous, as this can never be useful.  Only
-      # here for completeness.
-      _directories
-      ;;
-    ((#i)svn.(trunk|tags|branches))
-      _alternative \
-        'sub-directories:sub-directory:_directories' \
-        'urls: :_urls' && ret=0
-      ;;
-    ((#i)svn.prefix)
-      _message -e 'prefix'
-      ;;
-    ((#i)svn.rmdir)
-      __git_boolean_settings false 'remove empty directories from SVN tree after commit' 'leave empty directories from SVN tree after commit'
-      ;;
-    ((#i)svn.edit)
-      __git_boolean_settings false 'edit commit message before committing' 'use commit message from SVN'
-      ;;
-    ((#i)svn.findcopiesharder)
-      __git_boolean_settings false 'try harder to find copies' 'use simple copy-finding algorithm'
-      ;;
-    ((#i)svn.l)
-      _guard "[[:digit:]]#" number
-      ;;
-    ((#i)svn.copysimilarity)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.revision)
-      __git_svn_revisions
-      ;;
-    ((#i)svn.merge)
-      __git_boolean_settings false 'use merging strategies' 'don'\''t try to merge'
-      ;;
-    ((#i)svn.fetch-all)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.stdin)
-      __git_boolean_settings false 'read list of commits to commit from stdin' 'don'\''t necessarily read list of commits to commit from stdin'
-      ;;
-    ((#i)svn.strategy)
-      __git_merge_strategies
-      ;;
-    ((#i)svn.verbose)
-      __git_boolean_settings false 'output extra information'
-      ;;
-    ((#i)svn.dryrun)
-      __git_boolean_settings false 'output git-commands that would show diffs that would be committed' 'actually run the git commands'
-      ;;
-    ((#i)svn.minimize)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.limit)
-      _guard "[[:digit:]]#" limit
-      ;;
-    ((#i)svn.incremental)
-      __git_boolean_settings false 'give output suitable for concatenation'
-      ;;
-    ((#i)svn.showcommit)
-      __git_boolean_settings false 'output git commit SHA-1, as well' 'don'\''t output git commit SHA-1'
-      ;;
-    ((#i)svn.online)
-      __git_boolean_settings false 'produce output similar to --pretty=oneline'
-      ;;
-    ((#i)svn.color)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.pager)
-      _message -e 'undocumented'
-      ;;
-    ((#i)svn.nonrecursive)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.local)
-      __git_boolean_settings false 'undocumented'
-      ;;
-    ((#i)svn.message)
-      _message -e 'undocumented'
-      ;;
-    ((#i)svn.file)
-      _message -e 'undocumented'
-      ;;
-    ((#i)svn-remote.*.rewriteRoot)
-      _message -e 'new root'
-      ;;
-    (*)
-      _message 'value'
-      ;;
-  esac
+  _wanted changed-in-working-tree-files expl 'changed in working tree file' _multi_parts $@ -f - / files
 }
 
-# __git_boolean_settings [-t TAG] [-l LABEL] DEFAULT 'follow parent commit' ['follow HEAD commit']
-#
-# -t can be used to specify a tag to use (default: booleans).
-# -l can be used to specify a label to use (default: 'boolean').
-#
-# The first argument is the default value, so that the description of the
-# default value can be suffixed with " (default)".  The second argument
-# is the description for the true value.  If a third argument is given,
-# it is used as the description for the false value.  If it is not given,
-# the description will be the true value's description with the prefix
-# "don't ".
-(( $+functions[__git_boolean_settings] )) ||
-__git_boolean_settings () {
-  local tag label garbage
+(( $+functions[__git_changed_files] )) ||
+__git_changed_files () {
+  _alternative \
+    'changed-in-index-files::__git_changed-in-index_files' \
+    'changed-in-working-tree-files::__git_changed-in-working-tree_files'
+}
 
-  zparseopts -D -E -a garba S: M: J: V: 1 2 n F: X: -t=tag -l=label
+(( $+functions[__git_tree_files] )) ||
+__git_tree_files () {
+  local multi_parts_opts
+  local tree Path
+  integer at_least_one_tree_added
+  local -a tree_files compadd_opts
 
-  declare -A descriptions
+  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
 
-  descriptions=(true $2 false 'don'\''t '"$2")
+  [[ "$1" == */ ]] && Path="$1" || Path="${1:h}/"
+  shift
+  (( at_least_one_tree_added = 0 ))
+  for tree in $*; do
+    tree_files+=(${(ps:\0:)"$(_call_program tree-files git ls-tree --name-only -z $tree $Path 2>/dev/null)"})
+    __git_command_successful $pipestatus && (( at_least_one_tree_added = 1 ))
+  done
 
-  if (( $# > 2 )); then
-    descriptions[false]=$3
+  if (( !at_least_one_tree_added )); then
+    return 1
   fi
 
-  descriptions[$1]+=" (default)"
-
-  declare -a booleans
+  local expl
+  _wanted files expl 'tree file' _multi_parts -f $compadd_opts -- / tree_files
+}
 
-  booleans=(
-    {true,yes}':'$descriptions[true]
-    {false,no}':'$descriptions[false])
+# Repository Argument Types
 
-  _describe -t ${tag:-booleans} ${label:-boolean} booleans
-}
+# _remote_files
+_remote_files () {
+  # FIXME: these should be imported from _ssh
+  # TODO: this should take -/ to only get directories
+  # There should be coloring based on all the different ls -F classifiers.
+  local expl rempat remfiles remdispf remdispd args suf ret=1
 
-# TODO: Use this function in other places.
-(( $+functions[__git_colors] )) ||
-__git_colors () {
-  declare -a colors
+  if zstyle -T ":completion:${curcontext}:files" remote-access; then
+    zparseopts -D -E -a args p: 1 2 4 6 F:
+    if [[ -z $QIPREFIX ]]
+    then rempat="${PREFIX%%[^./][^/]#}\*"
+    else rempat="${(q)PREFIX%%[^./][^/]#}\*"
+    fi
+    remfiles=(${(M)${(f)"$(_call_program files ssh $args -a -x ${IPREFIX%:} ls -d1FL "$rempat" 2>/dev/null)"}%%[^/]#(|/)})
+    compset -P '*/'
+    compset -S '/*' || suf='remote file'
 
-  colors=(black red green yellow blue magenta cyan white)
+    remdispd=(${(M)remfiles:#*/})
 
-  _describe -t colors 'color' colors $*
+    _tags files
+    while _tags; do
+      while _next_label files expl ${suf:-remote directory}; do
+	compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \
+	    ${(q)remdispd%/} && ret=0
+      done
+      (( ret )) || return 0
+    done
+    return ret
+  else
+    _message -e remote-files 'remote file'
+  fi
 }
 
-# TODO: Use this function in other places.
-(( $+functions[__git_color_attributes] )) ||
-__git_color_attributes () {
-  declare -a attributes
+(( $+functions[__git_remote_repositories] )) ||
+__git_remote_repositories () {
+  local service
 
-  attributes=(bold dim ul blink reverse)
+  service= _ssh
 
-  _describe -t attributes 'attribute' attributes $*
+  if compset -P '*:'; then
+    _remote_files
+  else
+    _ssh_hosts -S:
+  fi
 }
 
-(( $+functions[__git_config_section_names] )) ||
-__git_config_section_names () {
-  # TODO: Come up with a good way of extracting this information.
-  _guard "?#" "section name"
+(( $+functions[__git_repositories] )) ||
+__git_repositories () {
+  _alternative \
+    'local-repositories::__git_local_repositories' \
+    'remote-repositories::__git_remote_repositories'
 }
 
-(( $+functions[__git_archive_formats] )) ||
-__git_archive_formats () {
+(( $+functions[__git_local_repositories] )) ||
+__git_local_repositories () {
   local expl
-  declare -a formats
 
-  formats=(${${(f)"$(_call_program archive-formats git archive --list)"}})
-  __git_command_successful || return
+  _wanted local-repositories expl 'local repositories' _directories
+}
 
-  _wanted archive-formats expl 'archive format' compadd $formats
+(( $+functions[__git_any_repositories] )) ||
+__git_any_repositories () {
+  # TODO: should also be $GIT_DIR/remotes/origin
+  _alternative \
+    'local-repositories::__git_local_repositories' \
+    'remotes: :__git_remotes' \
+    'remote-repositories::__git_remote_repositories'
 }
 
-(( $+functions[__git_gpg_secret_keys] )) ||
-__git_gpg_secret_keys () {
-  local expl
+# Common Guards
 
-  _wanted secret-keys expl 'secret key' compadd \
-    ${${(Mo)$(_call_program secret-keys gpg --list-secret-keys 2>/dev/null):%<*>}//(<|>)/}
+(( $+functions[__git_guard] )) ||
+__git_guard () {
+  declare -A opts
+
+  zparseopts -K -D -A opts M: J: V: 1 2 n F: X:
+
+  [[ "$PREFIX$SUFFIX" != $~1 ]] && return 1
+
+  if (( $+opts[-X] )); then
+    _message -r $opts[-X]
+  else
+    _message -e $2
+  fi
+
+  [[ -n "$PREFIX$SUFFIX" ]]
 }
 
-(( $+functions[__git_merge_strategies] )) ||
-__git_merge_strategies () {
-  local expl
-  local -a merge_strategies
+__git_guard_branch-name () {
+  if [[ -n $PREFIX$SUFFIX ]]; then
+    _call_program check-ref-format git check-ref-format "refs/heads/$PREFIX$SUFFIX" &>/dev/null
+    (( ${#pipestatus:#0} > 0 )) && return 1
+  fi
 
-  if ! merge_strategies=(${=${${(M)${(f)"$(_call_program strategies git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.}); then
-    merge_strategies=(${=${${(M)${(f)"$(<$(git --exec-path)/git-merge)"}:#all_strategies*}##all_strategies=\'}%%\'})
+  _message -e 'branch name'
+
+  [[ -n $PREFIX$SUFFIX ]]
+}
+
+__git_guard_diff-stat-width () {
+  if [[ $PREFIX == *,* ]]; then
+    compset -P '*,'
+    __git_guard_number "filename width"
+  else
+    compset -S ',*'
+    __git_guard_number width
   fi
+}
+
+(( $+functions[__git_guard_number] )) ||
+__git_guard_number () {
+  _guard "[[:digit:]]#" ${1:-number}
+}
 
-  _wanted merge-strategies expl 'merge strategy' compadd -a merge_strategies "$@"
+(( $+functions[__git_guard_bytes] )) ||
+__git_guard_bytes () {
+  _guard '[[:digit:]]#([kKmMgG]|)' $*
 }
 
-# TODO: Use this in more places.
 (( $+functions[__git_datetimes] )) ||
 __git_datetimes () {
+  # TODO: Use this in more places.
   _guard "*" 'time specification'
 }
 
-# TODO: Use this in more places.
-# TODO: Use better algorithm, as shown in iconv completer (separate it to a new
-# Type).
-(( $+functions[__git_encodings] )) ||
-__git_encodings () {
-  local expl
-  _wanted encodings expl 'encoding' compadd "$@" \
-    -M 'm:{a-zA-Z}={A-Za-z} r:|-=* r:|=*' \
-    ${${${(f)"$(_call_program encodings iconv --list)"}## #}%//}
+(( $+functions[__git_stages] )) ||
+__git_stages () {
+  __git_guard $* "[[:digit:]]#" 'stage'
 }
 
-(( $+functions[__git_repository_permissions] )) ||
-__git_repository_permissions () {
-  declare -a permissions
+(( $+functions[__git_svn_revision_numbers] )) ||
+__git_svn_revision_numbers () {
+  __git_guard_number "revision number"
+}
+
+# _arguments Helpers
+
+(( $+functions[__git_setup_log_options] )) ||
+__git_setup_log_options () {
+  # TODO: Need to implement -<n> for limiting the number of commits to show.
+  log_options=(
+    '(- *)-h[display help]'
+    '(           --no-decorate)--decorate=-[print out ref names of any commits that are shown]: :__git_log_decorate_formats'
+    '(--decorate              )--no-decorate[do not print out ref names of any commits that are shown]'
+    '--source[show which ref each commit is reached from]')
+}
+
+(( $+functions[__git_setup_diff_options] )) ||
+__git_setup_diff_options () {
+  local diff_types='(-p -u --patch -U --unified --raw --patch-with-raw --stat --numstat --shortstat --dirstat --dirstat-by-file --summary --patch-with-stat --name-only --name-status --cumulative)'
+
+  diff_options=(
+    $diff_types{-p,-u,--patch}'[generate diff in patch format]'
+    $diff_types{-U,--unified=}'[generate diff with given lines of context]: :__git_guard_number lines'
+    $diff_types'--raw[generate default raw diff output]'
+    $diff_types'--patch-with-raw[generate patch but also keep the default raw diff output]'
+    '--patience[generate diffs with patience algorithm]'
+    $diff_types'--stat=-[generate diffstat instead of patch]:: :__git_guard_diff-stat-width'
+    $diff_types'--numstat[generate more machine-friendly diffstat]'
+    $diff_types'--shortstat[generate summary diffstat]'
+    $diff_types'--dirstat=-[generate dirstat by amount of changes]:: :__git_guard_number limit'
+    $diff_types'--dirstat-by-file=-[generate dirstat by number of files]:: :__git_guard_number limit'
+    $diff_types'--summary[generate condensed summary of extended header information]'
+    $diff_types'--patch-with-stat[generate patch and prepend its diffstat]'
+    '-z[use NUL termination on output]'
+    $diff_types'--name-only[show only names of changed files]'
+    $diff_types'--name-status[show only names and status of changed files]'
+    '--submodule=-[select output format for submodule differences]::format:((short\:"show pairs of commit names"
+                                                                            log\:"list commits like git submodule does (default)"))'
+    '(        --no-color --color-words)--color=-[show colored diff]:: :__git_color_whens'
+    '(--color            --color-words)--no-color[turn off colored diff]'
+    '--word-diff=-[show word diff]::mode:((color\:"highlight changed words using color"
+                                          plain\:"wrap deletions and insertions with markers"
+                                          porcelain\:"use special line-based format for scripts"
+                                          none\:"disable word diff"))'
+    '--word-diff-regex=-[specify what constitutes a word]:word regex'
+    '(--color --no-color              )--color-words=-[show colored-word diff]::word regex'
+    '--no-renames[turn off rename detection]'
+    '--check[warn if changes introduce trailing whitespace or space/tab indents]'
+    '--full-index[show full object name of pre- and post-image blob]'
+    '(--full-index)--binary[in addition to --full-index, output binary diffs for git-apply]'
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length'
+    # TODO: --break-rewrites is undocumented.
+    '(-B --break-rewrites)'{-B-,--break-rewrites=-}'[break complete rewrite changes into pairs of given size]:: :__git_guard_number size'
+    # TODO: --detect-renames is undocumented.
+    '(-M --detect-renames)'{-M-,--detect-renames=-}'[detect renames with given scope]:: :__git_guard_number size'
+    # TODO: --detect-copies is undocumented.
+    '(-C --detect-copies)'{-C-,--detect-copies=-}'[detect copies as well as renames with given scope]:: :__git_guard_number size'
+    '--find-copies-harder[try harder to find copies]'
+    '-l-[limit number of rename/copy targets to run]: :__git_guard_number'
+    '--diff-filter=-[select certain kinds of files for diff]: :_guard "[ACDMRTUXB*]#" kinds'
+    '-S-[look for differences that contain the given string]:string'
+    '--pickaxe-all[when -S finds a change, show all changes in that changeset]'
+    '--pickaxe-regex[treat argument of -S as regular expression]'
+    '-O-[output patch in the order of glob-pattern lines in given file]: :_files'
+    '-R[do a reverse diff]'
+    '--relative=-[exclude changes outside and output relative to given directory]:: :_directories'
+    '(-a --text)'{-a,--text}'[treat all files as text]'
+    '--ignore-space-at-eol[ignore changes in whitespace at end of line]'
+    '(-b --ignore-space-change -w --ignore-all-space)'{-b,--ignore-space-change}'[ignore changes in amount of white space]'
+    '(-b --ignore-space-change -w --ignore-all-space)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
+    '--inter-hunk-context=[combine hunks closer than n lines]:n'
+    '--exit-code[report exit code 1 if differences, 0 otherwise]'
+    '(--exit-code)--quiet[disable all output]'
+    '(           --no-ext-diff)--ext-diff[allow external diff helper to be executed]'
+    '(--ext-diff              )--no-ext-diff[disallow external diff helper to be executed]'
+    '--ignore-submodules[ignore changes to submodules]:: :__git_ignore_submodules_whens'
+    '(--no-prefix)--src-prefix=[use given prefix for source]:prefix'
+    '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix'
+    '(--src-prefix --dst-prefix)--no-prefix[do not show any source or destination prefix]'
+
+    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-1,--base}'[diff against "base" version]'
+    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-2,--ours}'[diff against "our branch" version]'
+    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]'
+    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]'
+    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]'
+    '-q[remain silent even on nonexisting files]'
+
+    # TODO: --cumulative is undocumented.
+    '--cumulative[undocumented]'
+    # TODO: --follow is undocumented.
+    '--follow[undocumented]'
+    # TODO: --textconv is undocumented.
+    '--textconv[undocumented]'
+    # TODO: --no-textconv is undocumented.
+    '--no-textconv[undocumented]'
+    # TODO: -G is undocumented.
+    '-G[undocumented]'
+    # TODO: --output is undocumented.
+    '--output[undocumented]:undocumented')
+}
+
+(( $+functions[__git_setup_revision_options] )) ||
+__git_setup_revision_options () {
+  local -a diff_options
+  __git_setup_diff_options
+
+  revision_options=(
+    $diff_options
+    # TODO: format pretty print format is a lot more advanced than this.
+    # TODO: You can’t actually specify --format without a format.
+    '(-v --header)'{--pretty=-,--format=-}'[pretty print commit messages]::format:((oneline\:"commit-ids and subject of messages"
+                                                                                    short\:"few headers and only subject of messages"
+                                                                                    medium\:"most parts of messages"
+                                                                                    full\:"all parts of commit messages"
+                                                                                    fuller\:"like full and includes dates"
+                                                                                    email\:"use email headers like From and Subject"
+                                                                                    raw\:"the raw commits"
+                                                                                    format\:"specify own format"))'
+    '--abbrev-commit[show only partial prefixes of commit object names]'
+    '--oneline[shorthand for --pretty=oneline --abbrev-commit]'
+    '--encoding=-[output log messages in given encoding]:: :__git_encodings'
+    '(--no-notes --show-notes --standard-notes --no-standard-notes)--no-notes[do not show notes that annotate commit]'
+    '(--no-notes --show-notes --standard-notes --no-standard-notes)--show-notes[do not show notes that annotate commit]:: :__git_note_references'
+    '(--no-notes --show-notes --standard-notes --no-standard-notes)--no-standard-notes[enable populating notes ref list from core.notesRef and notes.displayRef]'
+    '(--no-notes --show-notes --standard-notes --no-standard-notes)--no-standard-notes[disable populating notes ref list from core.notesRef and notes.displayRef]'
+    '(                --date)--relative-date[show dates relative to current time]'
+    '(--relative-date       )--date=-[format of date output]: :__git_date_formats'
+    '--parents[display parents of commit]'
+    '--children[display children of commit]'
+    '--left-right[mark which side of symmetric diff commit is reachable from]'
+    '--graph[display graphical representation of commit history]'
+    '--count[display how many commits would have been listed]'
+    '(-n --max-count)'{-n+,--max-count=}'[maximum number of commits to display]: :__git_guard_number'
+    '--skip=[skip given number of commits before output]: :__git_guard_number'
+    '(--max-age --since --after)'{--since=,--after=}'[show commits more recent than given date]:date'
+    '(--min-age --until --before)'{--until=,--before=}'[show commits older than given date]: :__git_guard_number timestamp'
+    '(          --since --after)--max-age=-[maximum age of commits to output]: :__git_guard_number timestamp'
+    '(          --until --before)--min-age[minimum age of commits to output]: :__git_guard_number timestamp'
+    '*--author=[limit commits to those by given author]:author'
+    '*--committer=[limit commits to those by given committer]:committer'
+    '*--grep=[limit commits to those with log messages matching the given pattern]:pattern'
+    '--all-match[limit commits to ones matching all --grep, --author, and --committer]'
+    '(-i --regexp-ignore-case)'{-i,--regexp-ignore-case}'[match regexps ignoring case]'
+    '(-E --extended-regexp)'{-E,--extended-regexp}'[use POSIX extended regexps]'
+    '(-F --fixed-strings)'{-F,--fixed-strings}'[do not interpret patterns as regexps]'
+    '--remove-empty[stop when given path disappears from tree]'
+    '--merges[display only merge commits]'
+    '--no-merges[do not display commits with more than one parent]'
+    '--first-parent[follow only first parent from merge commits]'
+    '*--not[reverses meaning of ^ prefix for revisions that follow]'
+    '--all[show all commits from refs]'
+    '--branches=-[show all commits from refs/heads]::pattern'
+    '--tags=[-show all commits from refs/tags]::pattern'
+    '--remotes=[-show all commits from refs/remotes]::pattern'
+    '--glob=[show all commits from refs matching glob]:pattern'
+    '--stdin[read commit objects from standard input]'
+    '--cherry-pick[omit any same-change commits]'
+    '(-g --walk-reflogs --reverse)'{-g,--walk-reflogs}'[walk reflog entries from most recent to oldest]'
+    '--merge[after a failed merge, show refs that touch files having a conflict]'
+    '--boundary[output uninteresting commits at boundary]'
+    '--simplify-by-decoration[show only commits that are referenced by a ref]'
+    '(               --dense --sparse --simplify-merges --ancestry-path)--full-history[do not prune history]'
+    '(--full-history         --sparse --simplify-merges --ancestry-path)--dense[only display selected commits, plus meaningful history]'
+    '(--full-history --dense          --simplify-merges --ancestry-path)--sparse[when paths are given, display only commits that changes any of them]'
+    '(--full-history --dense --sparse                   --ancestry-path)--simplify-merges[milder version of --full-history]'
+    '(--full-history --dense --sparse --simplify-merges                )--ancestry-path[only display commits that exists directly on ancestry chains]'
+    '(             --date-order)--topo-order[display commits in topological order]'
+    '(--topo-order             )--date-order[display commits in date order]'
+    '(-g --walk-reflogs)--reverse[display commits in reverse order]'
+    '(          --objects-edge)--objects[display object ids of objects referenced by listed commits]'
+    '(--objects               )--objects-edge[display object ids of objects referenced by listed and excluded commits]'
+    '(          --do-walk)--no-walk[only display given revs, do not traverse their ancestors]'
+    '(--no-walk          )--do-walk[only display given revs, traversing their ancestors]'
+
+    # TODO: --reflog is undocumented.
+    '--reflog[show all commits from reflogs]'
+    # TODO: --default is undocumented.
+    '--default[use argument as default revision]:default revision:__git_revisions'
+    # TODO: --full-diff is undocumented.
+    '(-c --cc            )--full-diff[undocumented]'
+    # TODO: --abrev is undocumented.
+    '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length'
+    # TODO: --no-abbrev is undocumented.
+    '--no-abbrev[undocumented]'
+    # TODO: --early-output is undocumented.
+    '--early-output=-[undocumented]::undocumented'
+    # TODO: --log-size is undocumented.
+    '--log-size[undocumented]')
+
+  if (( words[(I)--objects(|-edge)] )); then
+    revision_options+=('--unpacked[print object IDs not in packs]')
+  fi
+}
 
-  permissions=(
-    {group,true,yes}':files and objects are group-writable'
-    {all,world,everybody}':files and objects are readable by all users and group-shareable'
-    {umask,false}':use permissions reported by umask()')
+(( $+functions[__git_setup_merge_options] )) ||
+__git_setup_merge_options () {
+  merge_options=(
+    '(         --no-commit)--commit[perform the merge and commit the result]'
+    '(--commit            )--no-commit[perform the merge but do not commit the result]'
+    '(     --no-ff)--ff[do not generate a merge commit if the merge resolved as a fast-forward]'
+    '(--ff        )--no-ff[generate a merge commit even if the merge resolved as a fast-forward]'
+    '(      --no-log)--log[fill in one-line descriptions of the commits being merged in the log message]'
+    '(--log         )--no-log[do not list one-line descriptions of the commits being merged in the log message]'
+    '(-n --no-stat)--stat[show a diffstat at the end of the merge]'
+    '(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
+    '(         --no-squash)--squash[merge, but do not commit]'
+    '(--squash            )--no-squash[merge and commit]'
+    '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
+    '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
+    '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'
+    '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]')
+}
+
+(( $+functions[__git_setup_fetch_options] )) ||
+__git_setup_fetch_options () {
+  fetch_options=(
+    '(: *)--all[fetch all remotes]'
+    '(-a --append)'{-a,--append}'[append ref names and object names of fetched refs to "$GIT_DIR/FETCH_HEAD"]'
+    '--depth=[deepen the history of a shallow repository by the given number of commits]: :__git_guard_number depth'
+    '--dry-run[show what would be done, without making any changes]'
+    '(-f --force)'{-f,--force}'[allow refs that are not ancestors to be updated]'
+    '(-k --keep)'{-k,--keep}'[keep downloaded pack]'
+    '(-p --prune)'{-p,--prune}'[remove any remote tracking branches that no longer exist remotely]'
+    '(-n --no-tags -t --tags)'{-n,--no-tags}'[disable automatic tag following]'
+    '(--no-tags -t --tags)'{-t,--tags}'[fetch remote tags]'
+    '(-u --update-head-ok)'{-u,--update-head-ok}'[allow updates of current branch head]'
+    '--upload-pack=[specify path to git-upload-pack on remote side]:remote path'
+    '(-q --quiet -v --verbose --progress)'{-q,--quiet}'[suppress all output]'
+    '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]'
+    '(-q --quiet)--progress[output progress information]')
+}
+
+(( $+functions[__git_setup_apply_options] )) ||
+__git_setup_apply_options () {
+  apply_options=(
+    '--whitespace=[detect a new or modified line that ends with trailing whitespaces]: :__git_apply_whitespace_strategies'
+    '-p-[remove N leading slashes from traditional diff paths]: :_guard  "[[\:digit\:]]#" "number of slashes to remove"'
+    '-C-[ensure at least N lines of context match before and after each change]: :_guard  "[[\:digit\:]]#" "number of lines of context"'
+    '--reject[apply hunks that apply and leave rejected hunks in .rej files]'
+    '(--ignore-space-change --ignore-whitespace)'{--ignore-space-change,--ignore-whitespace}'[ignore changes in whitespace in context lines]'
+    '--directory=[root to prepend to all filenames]:root:_directories')
+}
+
+# Git Config Helpers
+
+(( $+functions[__git_config_get_regexp] )) ||
+__git_config_get_regexp () {
+  declare -A opts
+
+  zparseopts -A opts -D b: a:
+  [[ -n $opts[-b] ]] || opts[-b]='*.'
+  [[ -n $opts[-a] ]] || opts[-a]='.[^.]##'
+  [[ $1 == -- ]] && shift
 
-  _describe -t permissions 'permission' permissions
+  set -A $2 ${${${(0)"$(_call_program ${3:-$2} "git config -z --get-regexp -- '$1'")"}#${~opts[-b]}}%%${~opts[-a]}$'\n'*}
 }
 
-(( $+functions[__git_apply_whitespace_strategies] )) ||
-__git_apply_whitespace_strategies () {
-  declare -a strategies
+(( $+functions[__git_config_sections] )) ||
+__git_config_sections () {
+  declare -a opts
+  local regex tag desc
+  local -a groups
 
-  strategies=(
-    'nowarn:turn off the trailing-whitespace warning'
-    'warn:output trailing-whitespace warning, but apply patch'
-    'error:output trailing-whitespace warning and refuse to apply patch'
-    'error-all:same as "error", but output warnings for all files'
-    'strip:output trailing-whitespace warning and strip trailing whitespace')
+  zparseopts -a opts -D b: a:
+  regex=$1
+  tag=$2
+  desc=$3
+  shift 3
 
-  _describe -t strategies 'trailing-whitespace resolution strategy' strategies
+  __git_config_get_regexp $opts -- $regex groups $tag
+  # TODO: Should escape : with \: in groups.
+  _describe -t $tag $desc groups $*
 }
 
-(( $+functions[__git_svn_revisions] )) ||
-__git_svn_revisions () {
-  if [[ -prefix *: ]]; then
-    compset -P '*:'
+# __git_config_booleans [-t TAG] [-l LABEL] CURRENT DEFAULT DESCRIPTION [OTHER]...
+#
+# -t can be used to specify a tag to use (default: booleans).
+# -l can be used to specify a label to use (default: boolean).
+#
+# The first argument is the current value, so that the description of the
+# current value can be suffixed with “ (current)”.
+#
+# The second argument is the default value, so that the description of the
+# default value can be suffixed with “ (default)”.
+#
+# The third argument is the description to use for the true and false values.
+#
+# The rest of the arguments can be used to provide additional “boolean” values
+# that should be included.  They should be of the form that _describe expects.
+(( $+functions[__git_config_booleans] )) ||
+__git_config_booleans () {
+  local tag label current default description
+  declare -a booleans
 
-    _alternative \
-      'revision-numbers: :__git_svn_revision_numbers' \
-      'symbolic-revisions:symbolic revision:((HEAD\:"the topmost revision of the SVN repository"))'
-  else
-    _alternative \
-      'revision-numbers: :__git_svn_revision_numbers' \
-      'symbolic-revisions:symbolic revision:__git_svn_base_revisions'
-  fi
+  zparseopts -D t=tag l=label
+  current=$1
+  default=${2:-true}
+  description=$3
+  shift 3
+  booleans=(
+    {true,yes,on}":$description"
+    {false,no,off}":do not $description"
+    $*)
+
+  __git_config_values -t ${tag:-booleans} -l ${label:-boolean} -- "$current" $default $booleans
 }
 
-(( $+functions[__git_svn_revision_numbers] )) ||
-__git_svn_revision_numbers () {
-  _guard "[[:digit:]]#" "revision number"
+# __git_config_values [-t TAG] [-l LABEL] CURRENT DEFAULT [VALUES]...
+#
+# -t can be used to specify a tag to use (default: values).
+# -l can be used to specify a label to use (default: value).
+#
+# The first argument is the current value, so that the description of the
+# current value can be suffixed with “ (current)”.
+#
+# The second argument is the default value, so that the description of the
+# default value can be suffixed with “ (default)”.
+#
+# The rest of the arguments are values of the form VALUE:DESCRIPTION to be
+# passed to _describe.
+(( $+functions[__git_config_values] )) ||
+__git_config_values () {
+  declare -A opts
+  local current default key
+  declare -a values
+
+  zparseopts -A opts -D t: l:
+  [[ $1 == -- ]] && shift
+  current=$1
+  default=$2
+  shift 2
+  values=($*)
+  [[ -n $current ]] && values[(r)$(__git_pattern_escape $default):*]+=' (current)'
+  values[(r)$(__git_pattern_escape $default):*]+=' (default)'
+
+  _describe -t ${opts[-t]:-values} ${opts[-l]:-value} values
 }
 
-(( $+functions[__git_svn_base_revisions] )) ||
-__git_svn_base_revisions () {
-  declare -a revisions
+# Git Config Sections and Types
+(( $+functions[__git_browsers] )) ||
+__git_browsers () {
+  integer ret=1
+  local expl
+  declare -a userbrowsers builtinbrowsers
+
+  __git_config_get_regexp '^browser\..+\.cmd$' userbrowsers
+  builtinbrowsers=(
+    firefox
+    iceweasel
+    konquerer
+    w3m
+    links
+    lynx
+    dillo
+    open
+    start)
+
+  _tags user-browsers builtin-browsers
+
+  while _tags; do
+    _requested user-browsers expl 'user-defined browser' compadd $* - $userbrowsers && ret=0
+    _requested builtin-browsers expl 'builtin browser' compadd $* - $builtinbrowsers && ret=0
+
+    (( ret )) || break
+  done
 
-  revisions=(
-    'BASE:the bottommost revision of the SVN repository')
+  return ret
+}
 
-  # TODO: How do we deal with $*?
-  _describe -t symbolic-revisions 'symbolic revision' revisions -S ':' -r ': '
+(( $+functions[__git_difftools] )) ||
+__git_difftools () {
+  __git_diff-or-merge-tools diff $*
 }
 
-# TODO: numparent is undocumented.
-(( $+functions[__git_ref_sort_keys] )) ||
-__git_ref_sort_keys () {
-  compset -P '-'
+(( $+functions[__git_diff-or-merge-tools] )) ||
+__git_diff-or-merge-tools () {
+  local type=$1; shift
+  integer ret=1
+  local expl
+  declare -a userdifftools usermergetools builtintools builtindifftools builtinmergetools
+
+  [[ $type == diff ]] && __git_config_get_regexp '^difftool\..+\.cmd$' userdifftools
+  __git_config_get_regexp '^mergetool\..+\.cmd$' usermergetools
+  builtintools=(
+    kdiff3
+    tkdiff
+    xxdiff
+    meld
+    opendiff
+    vimdiff
+    gvimdiff
+    vimdiff2
+    gvimdiff2
+    emerge
+    ecmerge
+    diffuse
+    araxis
+    p4merge)
+
+  builtindifftools=($builtintools kompare)
+  builtinmergetools=($builtintools tortoisemerge)
+
+  case $type in
+    (diff) _tags user-difftools builtin-difftools user-mergetools ;;
+    (merge) _tags user-mergetools builtin-mergetools ;;
+  esac
 
-  local -a keys
+  while _tags; do
+    _requested user-difftools expl 'user-defined difftool' compadd $* - $userdifftools && ret=0
+    _requested user-mergetools expl 'user-defined mergetool' compadd $* - $usermergetools && ret=0
+    _requested builtin-difftools expl 'builtin difftool' compadd $* - $builtindifftools && ret=0
+    _requested builtin-mergetools expl 'builtin mergetool' compadd $* - $builtinmergetools && ret=0
 
-  keys=(
-    'refname:the name of the ref'
-    'objecttype:the type of the object'
-    'objectsize:the size of the object'
-    'objectname:the object name (SHA-1)'
-    'tree:the tree header-field'
-    'parent:the parent header-field'
-    'numparent:undocumented'
-    'object:the object header-field'
-    'type:the type header-field'
-    'tag:the tag header-field'
-    'author:the author header-field'
-    'authorname:the name component of the author header-field'
-    'authoremail:the email component of the author header-field'
-    'authordate:the date component of the author header-field'
-    'committername:the name component of the committer header-field'
-    'committeremail:the email component of the committer header-field'
-    'committerdate:the date component of the committer header-field'
-    'taggername:the name component of the tagger header-field'
-    'taggeremail:the email component of the tagger header-field'
-    'taggerdate:the date component of the tagger header-field'
-    'creatorname:the name component of the creator header-field'
-    'creatordate:the date component of the creator header-field'
-    'subject:the subject of the message'
-    'body:the body of the message'
-    'body:the contents of the message (subject and body)')
+    (( ret )) || break
+  done
 
-  _describe -t sort-keys 'sort key' keys
+  return ret
 }
 
-(( $+functions[__git_daemon_service] )) ||
-__git_daemon_service () {
-  local -a services
+(( $+functions[__git_mergetools] )) ||
+__git_mergetools () {
+  __git_diff-or-merge-tools merge $*
+}
 
-  services=(
-    'upload-pack:serve git-fetch-pack and git-peek-remote clients'
-    'upload-archive:serve git-archive --remote clients')
+(( $+functions[__git_merge_drivers] )) ||
+__git_merge_drivers () {
+  __git_config_sections '^merge\..+\.name$' merge-drivers 'merge driver' $*
+}
 
-  _describe -t services 'service' services
+(( $+functions[__git_builtin_merge_drivers] )) ||
+__git_builtin_merge_drivers () {
+  local -a builtin_merge_drivers
+  builtin_merge_drivers=(
+    text:'normal 3-way file-level merge for text files'
+    binary:'binary file merge driver'
+    union:'run 3-way file-levele merge with lines from both versions')
+  _describe -t builtin-merge-drivers 'builtin merge driver' builtin_merge_drivers $*
 }
 
-(( $+functions[__git_attributes] )) ||
-__git_attributes () {
-  local -a attributes
+(( $+functions[__git_man_viewers] )) ||
+__git_man_viewers () {
+  # TODO: Add support for standard commands.
+  __git_config_sections '^man\..+\.cmd$' man-viewers 'man viewer' $*
+}
 
-  attributes=(
-    'crlf:line-ending convention'
-    'ident:ident substitution'
-    'filter:filters'
-    'diff:textual diff'
-    'merge:merging strategy')
+(( $+functions[__git_svn-remotes] )) ||
+__git_svn-remotes () {
+  __git_config_sections -a '(|)' '^svn-remote\..+$' svn-remotes 'svn remote' $*
+}
 
-  _describe -t attributes 'attribute' attributes
-}
-
-# ---
-
-# TODO: How do we do -/n/ here?
-# --reflog undocumented
-# -m undocumented
-# -v undocumented
-# --root undocumented
-# --no-commit-id undocumented
-# --always undocumented
-# --abbrev undocumented
-# --abbrev-commit undocumented
-# --full-diff undocumented
-# --full-history undocumented
-# --all-match undocumented
-# optional argument to --unpacked undocumented
-(( $+functions[__git_setup_revision_arguments] )) ||
-__git_setup_revision_arguments () {
-  revision_arguments=(
-    '(-n --max-count -)'{-n+,--max-count=-}'[maximum number of commits to output]: :_guard "[[\:digit\:]]#" number'
-    '--skip=-[skip given number of commits before output]: :_guard "[[\:digit\:]]#" number'
-    '(          --since --after)--max-age=-[maximum age of commits to output]: :_guard "[[\:digit\:]]#" timestamp'
-    '(--max-age --since --after)'{--since=-,--after=-}'[show commits more recent than given date]:date'
-    '(          --until --before)--min-age[minimum age of commits to output]: :_guard "[[\:digit\:]]#" timestamp'
-    '(--min-age --until --before)'{--until=-,--before=-}'[show commits older than given date]: :_guard "[[\:digit\:]]#" timestamp'
-    '--all[show all commits from refs]'
-    '--branches[show all commits from refs/heads]'
-    '--tags[show all commits from refs/tags]'
-    '--remotes[show all commits from refs/remotes]'
-    '--cherry-pick[omit any same-change commits]'
-    '--graph[draw a graphical representation of the commit history]'
-    '--reflog[show all commits from reflogs]'
-    '(-g --walk-reflogs --reverse)'{-g,--walk-reflogs}'[walk reflog entries from most recent to oldest]'
-    '*--not[reverses meaning of ^ prefix for revisions that follow]'
-    '--default[use argument as default revision]:default revision:__git_revisions'
-    '--merge[after a failed merge, show refs that touch files having a conflict]'
-    '(             --date-order)--topo-order[show commits in topological order]'
-    '(--topo-order             )--date-order[show commits in date order]'
-    '(-g --walk-reflogs)--reverse[show commits in reverse order]'
-    '--parents[show parent commits]'
-    '(        --sparse)--dense[this is the inverse of --sparse, and is also the default]'
-    '(--dense         )--sparse[when paths are given, output only commits that changes any of them]'
-    '--remove-empty[stop when a given path disappears from the tree]'
-    '--no-merges[do not print commits with more than one parent]'
-    '--first-parent[follow only the first parent from merge commits]'
-    '--boundary[output uninteresting commits at the boundary]'
-    '--left-right[mark which side of a symmetric diff a commit is reachable from]'
-    '(          --objects-edge)--objects[show object ids of objects referenced by the listed commits]'
-    '(--objects               )--objects-edge[show object ids of objects referenced by the listed and excluded commits]'
-    '(   -t)-r[show recursive diffs]'
-    '(-r   )-t[show the tree objects in the diff output]'
-    '-m[do not ignore merges]'
-    '(   --cc --full-diff)-c[show merge diffs from parents simultaneously]'
-    '(-c      --full-diff)--cc[show merge diffs from parents simultaneously without one-parent diffs]'
-    '(-c --cc            )--full-diff[undocumented]'
-    '(   --pretty --header)-v[show verbose header]'
-    '(-v          --header)'$pretty_arg
-    '--root[show root diff]'
-    '--no-commit-id[do not show commit ids]'
-    '--always[always show header]'
-    $abbrev_arg
-    '--abbrev-commit[undocumented]'
-    '--simplify-merges[milder version of --full-history]'
-    '--full-history[undocumented]'
-    '--simplify-by-decoration[show only commits that are referenced by a ref]'
-    '--relative-date[show dates relative to the current time]'
-    '--date=-[format of date output]:date format:((relative\:"show dates relative to the current time"
-                                                   local\:"show timestamps in user'\''s local timezone"
-                                                   iso\:"show timestamps in ISO 8601 format"
-                                                   rfc\:"show timestamps in RFC 2822 format"
-                                                   short\:"show only date but not time"
-                                                   default\:"show timestamp in the original timezone"))'
-    '--author=-[limit commits to those by the given author]:author'
-    '--committer=-[limit commits to those by the given committer]:committer'
-    '--grep=-[limit commits to those with log messages matching the given pattern]:pattern'
-    '--all-match[undocumented]'
-    '--encoding=-[output log messages in given encoding]::encoding:__git_encodings'
-    $diff_args)
+(( $+functions[__git_remote-groups] )) ||
+__git_remote-groups () {
+  __git_config_sections -a '(|)' '^remotes\..+$' remotes-groups 'remotes group' $*
+}
+
+(( $+functions[__git_remotes_groups] )) ||
+__git_remotes_groups () {
+  local expl
+
+  _wanted remotes-groups expl 'remotes group' \
+    compadd $* - ${${${(0)"$(_call_program remotes-groups git config --get-regexp -z '"^remotes\..*$"')"}%%$'\n'*}#remotes.}
 
-  if (( words[(I)--objects(|-edge)] )); then
-    revision_arguments+=('--unpacked=-[print object IDs that are not in packs]::object')
-  fi
 }
 
-# ---
+(( $+functions[__git_sendemail_identities] )) ||
+__git_sendemail_identities () {
+  __git_config_sections '^sendemail\..+\.[^.]+$' identities 'sendemail identity' $*
+}
 
-(( $+functions[__git_is_type] )) ||
-__git_is_type () {
-  local sha1
-  sha1="$(git rev-parse $2 2> /dev/null)" &&
-  [[ "$(git cat-file -t "${sha1}^{$1}" 2> /dev/null)" == $1 ]]
+(( $+functions[__git_sendemail_smtpencryption_values] )) ||
+__git_sendemail_smtpencryption_values () {
+  __git_config_values -- "$current" "$parts[5]" \
+    ssl:'use SSL' \
+    tls:'use TLS'
 }
 
-(( $+functions[__git_is_committish] )) ||
-__git_is_committish () {
-  __git_is_type commit $1
+(( $+functions[__git_sendemail_confirm_values] )) ||
+__git_sendemail_confirm_values () {
+  __git_config_values -- "$current" "$parts[5]" \
+    always:'always confirm before sending' \
+    never:'never confirm before sending' \
+    cc:'confirm before sending to automatically added Cc-addresses' \
+    compose:'confirm before sending first message when using --compose' \
+    auto:'same as cc together with compose'
 }
 
-(( $+functions[__git_is_treeish] )) ||
-__git_is_treeish () {
-  __git_is_type tree $1
+(( $+functions[__git_sendemail_suppresscc_values] )) ||
+__git_sendemail_suppresscc_values () {
+  __git_config_values -- "$current" "$parts[5]" \
+    author:'avoid including patch author' \
+    self:'avoid including sender' \
+    cc:'avoid including anyone mentioned in Cc lines except for self' \
+    bodycc:'avoid including anyone mentiond in Cc lines in patch body except for self' \
+    sob:'avoid including anyone mentiond in Signed-off-by lines except for self' \
+    cccmd:'avoid running --cc-cmd' \
+    body:'equivalent to sob + bodycc' \
+    all:'avoid all auto Cc values'
 }
 
-(( $+functions[__git_is_indexed] )) ||
-__git_is_indexed () {
-  [[ -n $(git ls-files $REPLY) ]]
+(( $+functions[__git_colors] )) ||
+__git_colors () {
+  declare -a colors
+
+  colors=(black red green yellow blue magenta cyan white)
+
+  _describe -t colors color colors $*
 }
 
-local curcontext=$curcontext ret=1
+(( $+functions[__git_color_attributes] )) ||
+__git_color_attributes () {
+  declare -a attributes
 
-# fun with $words[] and $CURRENT to enable completion for args
-# to git aliases (eg. git co <TAB>)
-local -A git_aliases
-local -a git_aliases__
-git_aliases__=(${(f)${${${(f)"$(_call_program alias_expansion git config --get-regexp '\^alias\.')"}#alias.}/ /$'\n'}/(#e)/$'\n'})
-if (( ( ${#git_aliases__} % 2 ) == 0 )) ; then
-    git_aliases=(${git_aliases__})
-fi
-unset git_aliases__
+  attributes=(bold dim ul blink reverse)
 
-if (( CURRENT >= 3 )) && [[ -n ${git_aliases[$words[2]]} ]] ; then
-  local -a tmpwords expalias
-  expalias=(${(z)git_aliases[$words[2]]})
-  tmpwords=(${words[1]} ${expalias})
-  if [[ -n "${words[3,-1]}" ]] ; then
-      tmpwords+=(${words[3,-1]})
-  fi
-  [[ -n ${words[$CURRENT]} ]] || tmpwords+=('')
-  (( CURRENT += ${#expalias} - 1 ))
-  words=("${tmpwords[@]}")
-  unset tmpwords expalias
-fi
-
-if [[ $service == git ]]; then
-  local state line
-  declare -A opt_args
-  _arguments -C \
-    '(- :)--version[display version information]' \
-    '(- :)--help[display help message]' \
-    '--exec-path=-[path containing core git-programs]::directory:_directories' \
-    '(-p --paginate)'{-p,--paginate}'[pipe output into $PAGER]' \
-    '--no-pager[do not pipe git output into a pager]' \
-    '--git-dir=-[path to repository]:directory:_directories' \
-    '--work-tree=-[path to working tree]:directory:_directories' \
-    '--bare[use $PWD as repository]' \
-    '*::arg:->cmd_or_options' && return
-  case $state in
-    (cmd_or_options)
-      if (( CURRENT == 1 )); then
-        __git_aliases_and_commands
-      else
-        curcontext="${curcontext%:*:*}:git-$words[1]:"
-	if (( $+functions[_git-$words[1]] )); then
-          _call_function ret _git-$words[1]
-	else
-	  _files
-	fi
-        return ret
+  _describe -t attributes attribute attributes $*
+}
+
+# Now, for the main driver…
+_git() {
+  if (( CURRENT > 2 )); then
+    local -a aliases
+    local -A git_aliases
+    # TODO: Should use -z here, but I couldn’t get it to work.
+    aliases=(${(f)${${${(f)"$(_call_program aliases git config --get-regexp '\^alias\.')"}#alias.}/ /$'\n'}/(#e)/$'\n'})
+    (( $#aliases % 2 == 0 )) && git_aliases=($aliases)
+
+    if [[ -n ${git_aliases[$words[2]]} ]] ; then
+      local -a tmpwords expalias
+      expalias=(${(z)git_aliases[$words[2]]})
+      tmpwords=(${words[1]} ${expalias})
+      if [[ -n "${words[3,-1]}" ]] ; then
+          tmpwords+=(${words[3,-1]})
       fi
-      ;;
-  esac
-else
-  _call_function ret _$service
+      [[ -n ${words[$CURRENT]} ]] || tmpwords+=('')
+      (( CURRENT += ${#expalias} - 1 ))
+      words=("${tmpwords[@]}")
+      unset tmpwords expalias
+    fi
+
+    unset git_aliases aliases
+  fi
+
+  local ret=1
+  if [[ $service == git ]]; then
+    local curcontext=$curcontext state line
+    declare -A opt_args
+
+    # TODO: This needs an update
+    # TODO: How do we fix -c argument?
+    _arguments -C \
+      '(- :)--version[display version information]' \
+      '(- :)--help[display help message]' \
+      '-c[pass configuration parameter to command]:parameter' \
+      '--exec-path=-[path containing core git-programs]:: :_directories' \
+      '--html-path[display path to HTML documentation and exit]' \
+      '(-p --paginate)'{-p,--paginate}'[pipe output into $PAGER]' \
+      '--no-pager[do not pipe git output into a pager]' \
+      '--git-dir=-[path to repository]: :_directories' \
+      '--work-tree=-[path to working tree]: :_directories' \
+      '--bare[use $PWD as repository]' \
+      '--no-replace-objects[do not use replacement refs to replace git objects]' \
+      '(-): :->command' \
+      '(-)*:: :->option-or-argument' && return
+    case $state in
+      (command)
+        __git_aliases_and_commands && ret=0
+        ;;
+      (option-or-argument)
+        curcontext=${curcontext%:*:*}:git-$words[1]:
+
+        _call_function ret _git-$words[1]
+        ;;
+    esac
+  else
+    _call_function ret _$service
+  fi
   return ret
-fi
 }
 
 _git