Subject: Re: [PATCH] Documentation: add a script to generate a (long/short) options overview

From: Stefan Beller <[email-masked]>
Date: Fri, 01 Nov 2013 00:09:10 +0100

On 11/01/2013 12:04 AM, Stefan Beller wrote:
> Recently a discussion started on the mailing list, which short option
> shall be best for a long option. (-f being always --force and therefore
> should not be reassigned another meaning in one particular command)
> See http://www.mail-archive.com/[email-masked]/msg38456.html
> 
> For discussions as these we need a script to easily generate an
> overview of all available one letter options, and their long option
> equivalents.
> 
> As the list of options was not retrieved fully automated,
> there might be minor errors or missing items.
> 
> Signed-off-by: Stefan Beller <[email-masked]>
> ---
>  Documentation/generateShortOptions.py | 460 ++++++++++++++++++++++++++++++++++
>  1 file changed, 460 insertions(+)
>  create mode 100644 Documentation/generateShortOptions.py
> 

When trying to send a follow-up patch with the table itself, I got:
fatal: /tmp/wHpJlnf1r5/0002-Documentation-add-table-viewing-short-long-options-f.patch: 19: patch contains a line longer than 998 characters
warning: no patches were sent

Is this an artifical limitation or something that actually makes sense?

Anyway here is the table, updated to carry more commands and sorted:

>>From 7d2ba0af3500f1629783dfc80aafe218dee8618c Mon Sep 17 00:00:00 2001
From: Stefan Beller <[email-masked]>
Date: Fri, 1 Nov 2013 00:01:21 +0100
Subject: [PATCH 2/2] Documentation: add table viewing (short/long) options for
 all commands

Signed-off-by: Stefan Beller <[email-masked]>
---
 Documentation/ShortOptions.txt | 73 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 Documentation/ShortOptions.txt

diff --git a/Documentation/ShortOptions.txt b/Documentation/ShortOptions.txt
new file mode 100644
index 0000000..dd76512
--- /dev/null
+++ b/Documentation/ShortOptions.txt
@@ -0,0 +1,73 @@
+         Name\short |      q |             v |             n |          s |      f |         m |                u |         a |              p |        e |                   l |                X |            i |              n |                p |            d |                  u |                 o |             f |              F |               c |         t |     z |       a |                    b |      q |              A |              N |             k |                   i |               s |       3 |              C |         S |       b |       g |        r |            w |               B |            C |                    D |             M |        U |                 W |              c |           e |     k |            m |       r |        v |                 w |     2 |  
              B |                E |             G |               H |                    L |                    O |            P |        R |                 W |        x |     3 |                E |
              F |         N |      d |             g |      h |      l |     t |     x
+                add |        |       verbose |       dry-run |            |  force |           |           update |           |          patch |     edit |                     |                  |  interactive |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |            all |  intent-to-add |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          add
+                 am |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |               utf8 |                   |               |                |                 |           |       |         |                      |  quiet |                |                |               |         interactive |         signoff |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |  keep |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |  3way |                  |
                |           |        |               |        |        |       |          am
+           annotate |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |        porcelain |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          annotate
+              apply |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |    3way |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |  reverse |                   |          |       |                  |
                |           |        |               |        |        |       |          apply
+            archive |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |            output |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          archive
+              blame |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |    show-number |        porcelain |              |                    |                   |     show-name |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |  show-email |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          blame
+             branch |  quiet |       verbose |               |            |  force |      move |  set-upstream-to |       all |                |          |       create-reflog |                  |              |                |                  |       delete |                    |                   |               |                |                 |     track |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |  remotes |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          branch
+         check-attr |        |               |               |            |        |           |                  |       all |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          check-attr
+       check-ignore |  quiet |       verbose |  non-matching |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          check-ignore
+           checkout |  quiet |               |               |            |  force |     merge |                  |           |          patch |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |     track |       |         |                      |        |                |                |               |                     |                 |  theirs |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |  ours |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          checkout
+     checkout-index |  quiet |               |     no-create |            |  force |           |            index |       all |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          checkout-index
+             cherry |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          cherry
+        cherry-pick |        |               |     no-commit |    signoff |        |  mainline |                  |           |                |     edit |                     |  strategy-option |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          cherry-pick
+              clean |  quiet |               |       dry-run |            |  force |           |                  |           |                |  exclude |                     |                  |  interactive |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          clean
+              clone |  quiet |       verbose |   no-checkout |     shared |        |           |      upload-pack |           |                |          |               local |                  |              |                |                  |              |                    |            origin |               |                |          config |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |  branch |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          clone
+             commit |  quiet |       verbose |     no-verify |    signoff |        |   message |  untracked-files |       all |          patch |     edit |                     |                  |      include |                |                  |              |                    |              only |               |           file |  reedit-message |  template |  null |         |                      |        |                |                |               |                     |                 |         |  reuse-message |  gpg-sign |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          commit
+             config |        |               |               |            |   file |           |                  |           |                |     edit |                list |                  |              |                |                  |              |                    |                   |               |                |                 |           |  null |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          config
+      count-objects |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |  human-readable |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          count-objects
+               diff |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |            patch |              |              patch |                   |               |                |                 |           |       |    text |  ignore-space-change |        |                |                |               |                     |                 |         |                |           |         |         |          |              |  break-rewrites |  find-copies |  irreversible-delete |  find-renames |  unified |  function-context |                |             |       |              |         |          |  ignore-all-space |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          diff
+         diff-files |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |            patch |              |              patch |                   |               |                |                 |           |       |    text |  ignore-space-change |        |                |                |               |                     |                 |         |                |           |         |         |          |              |  break-rewrites |  find-copies |  irreversible-delete |  find-renames |  unified |  function-context |             cc |             |       |              |         |          |  ignore-all-space |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          diff-files
+              fetch |  quiet |       verbose |               |            |  force |  multiple |   update-head-ok |    append |          prune |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |      tags |       |         |                      |        |                |                |          keep |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          fetch
+      filter-branch |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |         force |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          filter-branch
+      fmt-merge-msg |        |               |               |            |        |   message |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |           file |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          fmt-merge-msg
+       for-each-ref |        |               |               |      shell |        |           |                  |           |           perl |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          for-each-ref
+       format-patch |  quiet |  reroll-count |      numbered |    signoff |        |           |                  |           |        no-stat |          |                     |                  |              |                |                  |              |                    |  output-directory |               |                |                 |           |       |         |                      |        |                |    no-numbered |  keep-subject |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          format-patch
+               fsck |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          fsck
+       fsck-objects |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          fsck-objects
+                 gc |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          gc
+               grep |  quiet |  invert-match |   line-number |            |        |           |                  |      text |  show-function |          |  files-with-matches |                  |  ignore-case |                |                  |              |                    |                   |               |  fixed-strings |           count |           |  null |         |                      |        |  after-context |                |               |                     |                 |         |        context |           |         |         |          |  word-regexp |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
 before-context |  extended-regexp |  basic-regexp |                 |  files-without-match |  open-files-in-pager |  perl-regexp |          |  function-context |          |       |                  |
                |           |        |               |        |        |       |          grep
+               help |        |               |               |            |        |       man |                  |       all |                |          |                     |                  |         info |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |  guides |          |          web |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          help
+               init |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          init
+            init-db |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          init-db
+          insta-web |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |             port |              |                    |                   |               |                |                 |           |       |         |              browser |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |  module-path |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |  httpd |               |        |  local |       |          insta-web
+                log |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          log
+           ls-files |        |               |               |      stage |        |  modified |         unmerged |           |                |          |                     |     exclude-from |      ignored |                |                  |      deleted |                    |            others |               |                |          cached |           |       |         |                      |        |                |                |        killed |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |  exclude |       |                  |
                |           |        |               |        |        |       |          ls-files
+         ls-remotes |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |        upload-pack |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |  heads |        |  tags |          ls-remotes
+            ls-tree |        |               |               |            |        |           |                  |           |                |          |                long |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          ls-tree
+              merge |  quiet |       verbose |       no-stat |   strategy |        |   message |                  |           |                |     edit |                     |  strategy-option |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |  gpg-sign |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          merge
+         merge-base |        |               |               |            |        |           |                  |       all |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          merge-base
+         merge-file |  quiet |               |               |            |        |           |                  |           |         stdout |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          merge-file
+                 mv |        |       verbose |       dry-run |            |  force |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          mv
+       pack-objects |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          pack-objects
+              prune |        |       verbose |       dry-run |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          prune
+       prune-packed |  quiet |               |       dry-run |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          prune-packed
+               pull |        |               |               |   strategy |        |           |                  |           |                |          |                     |  strategy-option |              |        no-stat |                  |              |     update-head-ok |                   |         force |                |                 |           |       |  append |                      |  quiet |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |  keep |              |  rebase |  verbose |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          pull
+               push |  quiet |       verbose |       dry-run |            |  force |           |     set-upstream |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          push
+       quilt-import |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |        dry-run |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          quilt-import
+          read-tree |        |       verbose |       dry-run |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          read-tree
+             rebase |        |               |               |   strategy |        |           |                  |           |                |          |                     |  strategy-option |              |        no-stat |  preserve-merges |              |                    |                   |  force-rebase |                |                 |           |       |         |                      |        |                |                |               |         interactive |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |        merge |  rebase |  verbose |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |  exec    rebase
+             reflog |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          reflog
+             remote |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          remote
+             repack |  quiet |               |               |            |        |           |                  |           |                |          |               local |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          repack
+            replace |        |               |               |            |  force |           |                  |           |                |          |                list |                  |              |                |                  |       delete |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          replace
+              reset |  quiet |               |               |            |        |           |                  |           |          patch |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          reset
+           rev-list |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |      max-count |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |  regexp-ignore-case |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |  extended-regexp |
  fixed-strings |           |        |  walk-reflogs |        |        |       |          rev-list
+             revert |        |               |     no-commit |    signoff |        |  mainline |                  |           |                |     edit |                     |  strategy-option |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          revert
+                 rm |  quiet |               |       dry-run |            |  force |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          rm
+           shortlog |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |       numbered |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |         summary |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |       email |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          shortlog
+               show |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          show
+        show-branch |        |               |               |            |        |           |                  |       all |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |  reflog |  remotes |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          show-branch
+           show-ref |  quiet |               |               |       hash |        |           |                  |           |                |          |                     |                  |              |                |                  |  dereference |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          show-ref
+              stage |        |       verbose |       dry-run |            |  force |           |           update |           |          patch |     edit |                     |                  |  interactive |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |            all |  intent-to-add |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          stage
+              stash |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |            patch |              |  include-untracked |                   |               |                |                 |           |       |     all |                      |  quiet |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          stash
+             status |        |       verbose |               |      short |        |           |  untracked-files |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |  null |         |                      |        |                |                |               |                     |                 |         |                |           |  branch |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          status
+         stripspace |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |  strip-comments |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |  comment-lines |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          stripspace
+          submodule |        |               |               |            |        |           |                  |           |                |          |                     |                  |              |  summary-limit |                  |              |                    |                   |         force |                |                 |           |       |         |               branch |  quiet |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |  no-fetch |        |               |        |        |       |          submodule
+       symbolic-ref |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |       delete |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          symbolic-ref
+                tag |        |        verify |               |       sign |  force |   message |       local-user |  annotate |                |          |                list |                  |              |                |                  |       delete |                    |                   |               |           file |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          tag
+ update-server-info |        |               |               |            |  force |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          update-server-info
+        verify-pack |        |       verbose |               |  stat-only |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          verify-pack
+         verify-tag |        |       verbose |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          verify-tag
+        whatchanged |  quiet |               |               |            |        |           |                  |           |                |          |                     |                  |              |                |                  |              |                    |                   |               |                |                 |           |       |         |                      |        |                |                |               |                     |                 |         |                |           |         |         |          |              |                 |              |                      |               |          |                   |                |             |       |              |         |          |                   |       |  
                |                  |               |                 |                      |                      |              |          |                   |          |       |                  |
                |           |        |               |        |        |       |          whatchanged
-- 
1.8.4.1.605.g23c6912