diff --git a/src/GitParamTabExpansion.ps1 b/src/GitParamTabExpansion.ps1
index a3839bc5c..cb4be3b11 100644
--- a/src/GitParamTabExpansion.ps1
+++ b/src/GitParamTabExpansion.ps1
@@ -1,4 +1,7 @@
+$shortFormatParamsGlobal = 'a b B c C D G I l m M O p R s S t u U W w X z'
+
 # Variable is used in GitTabExpansion.ps1
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
 $shortGitParams = @{
     add = 'n v f i p e u A N'
     bisect = ''
@@ -11,27 +14,29 @@ $shortGitParams = @{
     clone = 'l s q v n o b u c'
     commit = 'a p C c z F m t s n e i o u v q S'
     config = 'f l z e'
-    diff = 'p u s U z B M C D l S G O R a b w W'
+    diff = "$shortFormatParamsGlobal"
     difftool = 'd y t x g'
     fetch = 'a f k p n t u q v'
     grep = 'a i I w v h H E G P F n l L O z c p C A B W f e q'
     help = 'a g i m w'
     init = 'q'
-    log = 'L n i E F g c c m r t'
+    log = "$shortFormatParamsGlobal L i E F g r"
     merge = 'e n s X q v S m'
     mergetool = 't y'
     mv = 'f k n v'
     notes = 'f m F C c n s q v'
     prune = 'n v'
-    pull = 'q v e n s X r a f k u'
+    pull = 'q v e n s X r a f k'
     push = 'n f u q v'
     rebase = 'm s X S q v n C f i p x'
+    reflog = "$shortFormatParamsGlobal"
     remote = 'v'
     reset = 'q p'
     restore = 's p W S q m'
     revert = 'e m n S s X'
     rm = 'f n r q'
     shortlog = 'n s e w'
+    show = "$shortFormatParamsGlobal"
     stash = 'p k u a q'
     status = 's b u z'
     submodule = 'q b f n N'
@@ -40,7 +45,9 @@ $shortGitParams = @{
     whatchanged = 'p'
 }
 
+$longFormatParamsGlobal = 'abbrev abbrev-commit anchored= binary break-rewrites cc check color color-moved color-moved-ws= color-words combined-all-paths compact-summary cumulative diff-algorithm= diff-filter= diff-merges= dirstat dirstat-by-file dst-prefix= exit-code ext-diff find-copies find-copies-harder find-object= find-renames full-index function-context histogram ignore-all-space ignore-blank-lines ignore-cr-at-eol ignore-matching-lines= ignore-space-at-eol ignore-space-change ignore-submodules indent-heuristic inter-hunk-context= irreversible-delete ita-invisible-in-index line-prefix= minimal name-only name-status no-abbrev-commit no-color no-color-moved no-color-moved-ws no-diff-merges no-ext-diff no-indent-heuristic no-patch no-prefix no-relative no-renames no-textconv numstat output-indicator-context= output-indicator-new= output-indicator-old= output= patch patch-with-raw patch-with-stat patience pickaxe-all pickaxe-regex quiet raw relative remerge-diff rename-empty rotate-to= shortstat skip-to= src-prefix= stat submodule summary text textconv unified= word-diff word-diff-regex= ws-error-highlight='
 # Variable is used in GitTabExpansion.ps1
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
 $longGitParams = @{
     add = 'dry-run verbose force interactive patch edit update all no-ignore-removal no-all ignore-removal intent-to-add refresh ignore-errors ignore-missing renormalize'
     bisect = 'no-checkout term-old term-new'
@@ -53,30 +60,30 @@ $longGitParams = @{
     commit = 'all patch reuse-message reedit-message fixup squash reset-author short branch porcelain long null file author date message template signoff no-verify allow-empty allow-empty-message cleanup= edit no-edit amend no-post-rewrite include only untracked-files verbose quiet dry-run status no-status gpg-sign no-gpg-sign'
     config = 'replace-all add get get-all get-regexp get-urlmatch global system local file blob remove-section rename-section unset unset-all list bool int bool-or-int path null get-colorbool get-color edit includes no-includes'
     describe = 'dirty all tags contains abbrev candidates= exact-match debug long match always first-parent'
-    diff = 'cached patch no-patch unified= raw patch-with-raw minimal patience histogram diff-algorithm= stat numstat shortstat dirstat summary patch-with-stat name-only name-status submodule color no-color word-diff word-diff-regex color-words no-renames check full-index binary apprev break-rewrites find-renames find-copies find-copies-harder irreversible-delete diff-filter= pickaxe-all pickaxe-regex relative text ignore-space-at-eol ignore-space-change ignore-all-space ignore-blank-lines inter-hunk-context= function-context exit-code quiet ext-diff no-ext-diff textconv no-textconv ignore-submodules src-prefix dst-prefix no-prefix staged'
+    diff = "$longFormatParamsGlobal cached staged"
     difftool = 'dir-diff no-prompt prompt tool= tool-help no-symlinks symlinks extcmd= gui'
     fetch = 'all append depth= unshallow update-shallow dry-run force keep multiple prune no-tags tags recurse-submodules= no-recurse-submodules submodule-prefix= recurse-submodules-default= update-head-ok upload-pack quiet verbose progress'
     gc = 'aggressive auto prune= no-prune quiet force'
-    grep = 'cached no-index untracked no-exclude-standard exclude-standard text textconv no-textconv ignore-case max-depth word-regexp invert-match full-name extended-regexp basic-regexp perl-regexp fixed-strings line-number files-with-matches open-file-in-pager null count color no-color break heading show-function context after-context before-context function-context and or not all-match quiet'
+    grep = 'cached no-index untracked no-exclude-standard exclude-standard text textconv no-textconv ignore-case max-depth word-regexp invert-match full-name extended-regexp basic-regexp perl-regexp fixed-strings line-number files-with-matches open-files-in-pager null count color no-color break heading show-function context after-context before-context function-context and or not all-match quiet'
     help = 'all guides info man web'
     init = 'quiet bare template= separate-git-dir= shared='
-    log = 'follow no-decorate decorate source use-mailmap full-diff log-size max-count skip since after until before author committer grep-reflog grep all-match regexp-ignore-case basic-regexp extended-regexp fixed-strings perl-regexp remove-empty merges no-merges min-parents max-parents no-min-parents no-max-parents first-parent not all branches tags remote glob= exclude= ignore-missing bisect stdin cherry-mark cherry-pick left-only right-only cherry walk-reflogs merge boundary simplify-by-decoration full-history dense sparse simplify-merges ancestry-path date-order author-date-order topo-order reverse objects objects-edge unpacked no-walk= do-walk pretty format= abbrev-commit no-abbrev-commit oneline encoding= notes no-notes standard-notes no-standard-notes show-signature relative-date date= parents children left-right graph show-linear-break patch stat'
+    log = "$longFormatParamsGlobal follow no-decorate decorate source use-mailmap full-diff log-size max-count skip since after until before author committer grep-reflog grep all-match regexp-ignore-case basic-regexp extended-regexp fixed-strings perl-regexp remove-empty merges no-merges min-parents= max-parents= no-min-parents no-max-parents first-parent not all branches tags remotes glob= exclude= ignore-missing bisect stdin cherry-mark cherry-pick left-only right-only cherry walk-reflogs merge boundary simplify-by-decoration full-history dense sparse simplify-merges ancestry-path date-order author-date-order topo-order reverse objects objects-edge unpacked no-walk= do-walk pretty format= oneline encoding= notes no-notes standard-notes no-standard-notes show-signature relative-date date= parents children left-right graph show-linear-break"
     merge = 'commit no-commit edit no-edit ff no-ff ff-only log no-log stat no-stat squash no-squash strategy strategy-option verify-signatures no-verify-signatures summary no-summary quiet verbose progress no-progress gpg-sign rerere-autoupdate no-rerere-autoupdate abort allow-unrelated-histories'
     mergetool = 'tool= tool-help no-prompt prompt'
     mv = 'force dry-run verbose'
     notes = 'force message file reuse-message reedit-message ref ignore-missing stdin dry-run strategy= commit abort quiet verbose'
     prune = 'dry-run verbose expire'
-    pull = 'quiet verbose recurse-submodules= no-recurse-submodules= commit no-commit edit no-edit ff no-ff ff-only log no-log stat no-stat squash no-squash strategy= strategy-option= verify-signatures no-verify-signatures summary no-summary rebase= no-rebase all append depth= unshallow update-shallow force keep no-tags update-head-ok upload-pack progress'
+    pull = 'quiet verbose recurse-submodules= no-recurse-submodules= commit no-commit edit no-edit ff no-ff ff-only log no-log stat no-stat squash no-squash strategy= strategy-option= verify-signatures no-verify-signatures summary no-summary rebase= no-rebase all append depth= unshallow update-shallow force keep no-tags upload-pack progress'
     push = 'all prune mirror dry-run porcelain delete tags follow-tags receive-pack= exec= force-with-lease no-force-with-lease force repo= set-upstream thin no-thin quiet verbose progress recurse-submodules= verify no-verify'
     rebase = 'onto continue abort keep-empty skip edit-todo merge strategy= strategy-option= gpg-sign quiet verbose stat no-stat no-verify verify force-rebase fork-point no-fork-point ignore-whitespace whitespace= committer-date-is-author-date ignore-date interactive preserve-merges exec root autosquash no-autosquash autostash no-autostash no-ff'
-    reflog = 'stale-fix expire= expire-unreachable= all updateref rewrite verbose'
+    reflog = "$longFormatParamsGlobal stale-fix expire= expire-unreachable= all updateref rewrite verbose"
     remote = 'verbose'
     reset = 'patch quiet soft mixed hard merge keep'
     restore = 'source= patch worktree staged quiet progress no-progress ours theirs merge conflict= ignore-unmerged ignore-skip-worktree-bits overlay no-overlay'
     revert = 'edit mainline no-edit no-commit gpg-sign signoff strategy= strategy-option continue quit abort'
     rm = 'force dry-run cached ignore-unmatch quiet'
     shortlog = 'numbered summary email format='
-    show = 'pretty= format= abbrev-commit no-abbrev-commit oneline encoding= expand-tabs no-expand-tabs notes no-notes show-notes no-standard-notes standard-notes show-signature name-only name-status stat shortstat numstat'
+    show = "$longFormatParamsGlobal pretty= format= oneline encoding= expand-tabs no-expand-tabs notes no-notes show-notes no-standard-notes standard-notes show-signature"
     stash = 'patch no-keep-index keep-index include-untracked all quiet index'
     status = 'short branch porcelain long untracked-files ignore-submodules ignored column no-column'
     submodule = 'quiet branch force cached files summary-limit remote no-fetch checkout merge rebase init name reference recursive depth'
@@ -86,6 +93,7 @@ $longGitParams = @{
 }
 
 $shortVstsGlobal = 'h o'
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
 $shortVstsParams = @{
     abandon = "i $shortVstsGlobal"
     create = "d i p r s t $shortVstsGlobal"
@@ -98,6 +106,7 @@ $shortVstsParams = @{
 }
 
 $longVstsGlobal = 'debug help output query verbose'
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
 $longVstsParams = @{
     abandon = "id detect instance $longVstsGlobal"
     create = "auto-complete delete-source-branch work-items bypass-policy bypass-policy-reason description detect instance merge-commit-message open project repository reviewers source-branch squash target-branch title $longVstsGlobal"
@@ -110,6 +119,7 @@ $longVstsParams = @{
 }
 
 # Variable is used in GitTabExpansion.ps1
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
 $gitParamValues = @{
     blame = @{
         encoding = 'utf-8 none'