command-list.txton commit apply: --3way with add/add conflict (099f3c4)
   1# List of known git commands.
   2# command name                          category [deprecated] [common]
   3git-add                                 mainporcelain common
   4git-am                                  mainporcelain
   5git-annotate                            ancillaryinterrogators
   6git-apply                               plumbingmanipulators
   7git-archimport                          foreignscminterface
   8git-archive                             mainporcelain
   9git-bisect                              mainporcelain common
  10git-blame                               ancillaryinterrogators
  11git-branch                              mainporcelain common
  12git-bundle                              mainporcelain
  13git-cat-file                            plumbinginterrogators
  14git-check-attr                          purehelpers
  15git-checkout                            mainporcelain common
  16git-checkout-index                      plumbingmanipulators
  17git-check-ref-format                    purehelpers
  18git-cherry                              ancillaryinterrogators
  19git-cherry-pick                         mainporcelain
  20git-citool                              mainporcelain
  21git-clean                               mainporcelain
  22git-clone                               mainporcelain common
  23git-column                              purehelpers
  24git-commit                              mainporcelain common
  25git-commit-tree                         plumbingmanipulators
  26git-config                              ancillarymanipulators
  27git-count-objects                       ancillaryinterrogators
  28git-cvsexportcommit                     foreignscminterface
  29git-cvsimport                           foreignscminterface
  30git-cvsserver                           foreignscminterface
  31git-daemon                              synchingrepositories
  32git-describe                            mainporcelain
  33git-diff                                mainporcelain common
  34git-diff-files                          plumbinginterrogators
  35git-diff-index                          plumbinginterrogators
  36git-diff-tree                           plumbinginterrogators
  37git-difftool                            ancillaryinterrogators
  38git-fast-export                         ancillarymanipulators
  39git-fast-import                         ancillarymanipulators
  40git-fetch                               mainporcelain common
  41git-fetch-pack                          synchingrepositories
  42git-filter-branch                       ancillarymanipulators
  43git-fmt-merge-msg                       purehelpers
  44git-for-each-ref                        plumbinginterrogators
  45git-format-patch                        mainporcelain
  46git-fsck                                ancillaryinterrogators
  47git-gc                                  mainporcelain
  48git-get-tar-commit-id                   ancillaryinterrogators
  49git-grep                                mainporcelain common
  50git-gui                                 mainporcelain
  51git-hash-object                         plumbingmanipulators
  52git-help                                ancillaryinterrogators
  53git-http-backend                        synchingrepositories
  54git-http-fetch                          synchelpers
  55git-http-push                           synchelpers
  56git-imap-send                           foreignscminterface
  57git-index-pack                          plumbingmanipulators
  58git-init                                mainporcelain common
  59git-instaweb                            ancillaryinterrogators
  60gitk                                    mainporcelain
  61git-log                                 mainporcelain common
  62git-lost-found                          ancillarymanipulators   deprecated
  63git-ls-files                            plumbinginterrogators
  64git-ls-remote                           plumbinginterrogators
  65git-ls-tree                             plumbinginterrogators
  66git-mailinfo                            purehelpers
  67git-mailsplit                           purehelpers
  68git-merge                               mainporcelain common
  69git-merge-base                          plumbinginterrogators
  70git-merge-file                          plumbingmanipulators
  71git-merge-index                         plumbingmanipulators
  72git-merge-one-file                      purehelpers
  73git-mergetool                           ancillarymanipulators
  74git-merge-tree                          ancillaryinterrogators
  75git-mktag                               plumbingmanipulators
  76git-mktree                              plumbingmanipulators
  77git-mv                                  mainporcelain common
  78git-name-rev                            plumbinginterrogators
  79git-notes                               mainporcelain
  80git-p4                                  foreignscminterface
  81git-pack-objects                        plumbingmanipulators
  82git-pack-redundant                      plumbinginterrogators
  83git-pack-refs                           ancillarymanipulators
  84git-parse-remote                        synchelpers
  85git-patch-id                            purehelpers
  86git-peek-remote                         purehelpers     deprecated
  87git-prune                               ancillarymanipulators
  88git-prune-packed                        plumbingmanipulators
  89git-pull                                mainporcelain common
  90git-push                                mainporcelain common
  91git-quiltimport                         foreignscminterface
  92git-read-tree                           plumbingmanipulators
  93git-rebase                              mainporcelain common
  94git-receive-pack                        synchelpers
  95git-reflog                              ancillarymanipulators
  96git-relink                              ancillarymanipulators
  97git-remote                              ancillarymanipulators
  98git-repack                              ancillarymanipulators
  99git-replace                             ancillarymanipulators
 100git-repo-config                         ancillarymanipulators   deprecated
 101git-request-pull                        foreignscminterface
 102git-rerere                              ancillaryinterrogators
 103git-reset                               mainporcelain common
 104git-revert                              mainporcelain
 105git-rev-list                            plumbinginterrogators
 106git-rev-parse                           ancillaryinterrogators
 107git-rm                                  mainporcelain common
 108git-send-email                          foreignscminterface
 109git-send-pack                           synchingrepositories
 110git-shell                               synchelpers
 111git-shortlog                            mainporcelain
 112git-show                                mainporcelain common
 113git-show-branch                         ancillaryinterrogators
 114git-show-index                          plumbinginterrogators
 115git-show-ref                            plumbinginterrogators
 116git-sh-setup                            purehelpers
 117git-stash                               mainporcelain
 118git-status                              mainporcelain common
 119git-stripspace                          purehelpers
 120git-submodule                           mainporcelain
 121git-svn                                 foreignscminterface
 122git-symbolic-ref                        plumbingmanipulators
 123git-tag                                 mainporcelain common
 124git-tar-tree                            plumbinginterrogators   deprecated
 125git-unpack-file                         plumbinginterrogators
 126git-unpack-objects                      plumbingmanipulators
 127git-update-index                        plumbingmanipulators
 128git-update-ref                          plumbingmanipulators
 129git-update-server-info                  synchingrepositories
 130git-upload-archive                      synchelpers
 131git-upload-pack                         synchelpers
 132git-var                                 plumbinginterrogators
 133git-verify-pack                         plumbinginterrogators
 134git-verify-tag                          ancillaryinterrogators
 135gitweb                                  ancillaryinterrogators
 136git-whatchanged                         ancillaryinterrogators
 137git-write-tree                          plumbingmanipulators