git: Shorten various long descriptions (#7752)

* Shorten various long descriptions

* Address review comments

share/completions/git.fish

@@ -812,7 +812,7 @@ complete -c git -n '__fish_git_using_command diff show range-diff' -l compact-su
 complete -c git -n '__fish_git_using_command diff show range-diff' -l dst-prefix -d 'Show the given destination prefix instead of "b/"'
 complete -c git -n '__fish_git_using_command diff show range-diff' -l ext-diff -d 'Allow an external diff helper to be executed'
 complete -c git -n '__fish_git_using_command diff show range-diff' -l find-copies-harder -d 'Inspect unmodified files as candidates for the source of copy'
-complete -c git -n '__fish_git_using_command diff show range-diff' -l find-object -d 'Look for differences that change the number of occurrences of the specified object'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l find-object -d 'Look for differences that change the number of occurrences of the object'
 complete -c git -n '__fish_git_using_command diff show range-diff' -l full-index -d 'Show the full pre- and post-image blob object names on the "index" line'
 complete -c git -n '__fish_git_using_command diff show range-diff' -l histogram -d 'Generate a diff using the "histogram diff" algorithm'
 complete -c git -n '__fish_git_using_command diff show range-diff' -l ignore-blank-lines -d 'Ignore changes whose lines are all blank'
@@ -850,16 +850,16 @@ complete -c git -n '__fish_git_using_command diff show range-diff' -s B -l break
 complete -c git -n '__fish_git_using_command diff show range-diff' -s b -l ignore-space-change -d 'Ignore changes in amount of whitespace'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s C -l find-copies -d 'Detect copies as well as renames'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s D -l irreversible-delete -d 'Omit the preimage for deletes'
-complete -c git -n '__fish_git_using_command diff show range-diff' -s G -d 'Look for differences whose patch text contains added/removed lines that match <regex>'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s G -d "Look for differences where <regex> matches the patch's added/removed lines"
 complete -c git -n '__fish_git_using_command diff show range-diff' -s M -l find-renames -d 'Detect and report renames'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s R -d 'Show differences from index or on-disk file to tree contents'
-complete -c git -n '__fish_git_using_command diff show range-diff' -s S -d 'Look for differences that change the number of occurrences of the specified string'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s S -d 'Look for differences that change the number of occurrences of the string'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s W -l function-context -d 'Show whole surrounding functions of changes'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s w -l ignore-all-space -d 'Ignore whitespace when comparing lines'
 complete -c git -n '__fish_git_using_command diff show range-diff' -s z -d 'Use NULs as output field/commit terminators'
 complete -r -c git -n '__fish_git_using_command diff show range-diff' -s O -d 'Control the order in which files appear in the output'
 complete -f -c git -n '__fish_git_using_command diff show range-diff' -l anchored -d 'Generate a diff using the "anchored diff" algorithm'
-complete -x -c git -n '__fish_git_using_command diff show range-diff' -s l -d 'Prevents rename/copy detection if the number of rename/copy targets exceeds the specified number'
+complete -x -c git -n '__fish_git_using_command diff show range-diff' -s l -d 'Prevents rename/copy detection when rename/copy targets exceed the given number'
 complete -x -c git -n '__fish_git_using_command diff show range-diff' -l diff-filter -a '(__fish_git_diff_opt diff-filter)' -d 'Choose diff filters'
 complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l diff-algorithm -a '(__fish_git_diff_opt diff-algorithm)' -d 'Choose a diff algorithm'
 complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l dirstat -a '(__fish_git_diff_opt dirstat)' -d 'Output the distribution of relative amount of changes for each sub-directory'
@@ -892,7 +892,7 @@ complete -f -c git -n '__fish_git_using_command filter-branch' -l subdirectory-f
 complete -f -c git -n '__fish_git_using_command filter-branch' -l prune-empty -d 'Ignore empty commits generated by filters'
 complete -f -c git -n '__fish_git_using_command filter-branch' -l original -d 'Use this option to set the namespace where the original commits will be stored'
 complete -r -c git -n '__fish_git_using_command filter-branch' -s d -d 'Use this option to set the path to the temporary directory used for rewriting'
-complete -c git -n '__fish_git_using_command filter-branch' -s f -l force -d 'Force filter branch to start even w/ refs in refs/original or existing temp directory'
+complete -c git -n '__fish_git_using_command filter-branch' -s f -l force -d 'Filter even with refs in refs/original or existing temp directory'
 
 ### remote
 set -l remotecommands add rm remove show prune update rename set-head set-url set-branches get-url
@@ -1186,13 +1186,13 @@ complete -c git -n '__fish_git_using_command log' -l no-min-parents -d 'Show onl
 complete -c git -n '__fish_git_using_command log' -l no-max-parents -d 'Show only commit without a maximum number of parents'
 complete -c git -n '__fish_git_using_command log' -l first-parent -d 'Follow only the first parent commit upon seeing a merge commit'
 complete -c git -n '__fish_git_using_command log' -l not -d 'Reverse meaning of ^ prefix'
-complete -c git -n '__fish_git_using_command log' -l all -d 'Pretend as if all refs in refs/ are listed on the command line as <commit>'
-complete -f -c git -n '__fish_git_using_command log' -l branches -d 'Pretend as if all refs are in refs/heads are listed on the command line as <commit>'
-complete -f -c git -n '__fish_git_using_command log' -l tags -d 'Pretend as if all refs are in ref/tags are listed on the command line as <commit>'
-complete -f -c git -n '__fish_git_using_command log' -l remotes -d 'Pretend as if all refs in refs/remotes  are listed on the command line as <commit>'
-complete -x -c git -n '__fish_git_using_command log' -l glob -d 'Pretend as if all refs matching shell glob are listed on the command line as <commit>'
+complete -c git -n '__fish_git_using_command log' -l all -d 'Show log for all branches, tags, and remotes'
+complete -f -c git -n '__fish_git_using_command log' -l branches -d 'Show log for all matching branches'
+complete -f -c git -n '__fish_git_using_command log' -l tags -d 'Show log for all matching tags'
+complete -f -c git -n '__fish_git_using_command log' -l remotes -d 'Show log for all matching remotes'
+complete -x -c git -n '__fish_git_using_command log' -l glob -d 'Show log for all matching branches, tags, and remotes'
 complete -x -c git -n '__fish_git_using_command log' -l exclude -d 'Do not include refs matching given glob pattern'
-complete -c git -n '__fish_git_using_command log' -l reflog -d 'Pretend as if all objcets mentioned by reflogs are listed on the command line as <commit>'
+complete -c git -n '__fish_git_using_command log' -l reflog -d 'Show log for all reflogs entries'
 complete -c git -n '__fish_git_using_command log' -l ingnore-missing -d 'Ignore invalid object names'
 complete -c git -n '__fish_git_using_command log' -l bisect
 complete -c git -n '__fish_git_using_command log' -l stdin -d 'Read commits from stdin'
@@ -1350,7 +1350,7 @@ complete -c git -n '__fish_git_using_command ls-files' -s k -l killed -d 'Show f
 complete -c git -n '__fish_git_using_command ls-files' -s z -d 'Use \0 delimiter'
 complete -c git -n '__fish_git_using_command ls-files' -s x -l exclude -d 'Skip untracked files matching pattern'
 complete -c git -n '__fish_git_using_command ls-files' -s X -l exclude-from -d 'Read exclude patterns from <file>; 1 per line'
-complete -c git -n '__fish_git_using_command ls-files' -l exclude-per-directory -d 'Read additional exclude patterns that apply only to the directory and its subdirectories in <file>'
+complete -c git -n '__fish_git_using_command ls-files' -l exclude-per-directory -d 'Read extra exclude patterns that apply only to the dir and its subdirs in <file>'
 complete -c git -n '__fish_git_using_command ls-files' -l exclude-standard -d 'Add the standard Git exclusions'
 complete -c git -n '__fish_git_using_command ls-files' -l error-unmatch -d 'If any <file> does not appear in the index, treat this as an error'
 complete -c git -n '__fish_git_using_command ls-files' -l with-tree
@@ -1731,7 +1731,7 @@ complete -f -c git -n '__fish_git_using_command format-patch' -l function-contex
 complete -f -c git -n '__fish_git_using_command format-patch' -l ext-diff -d "Allow an external diff helper to be executed"
 complete -f -c git -n '__fish_git_using_command format-patch' -l no-ext-diff -d "Disallow external diff helpers"
 complete -f -c git -n '__fish_git_using_command format-patch' -l no-textconv -d "Disallow external text conversion filters for binary files (Default)"
-complete -f -c git -n '__fish_git_using_command format-patch' -l textconv -d "Allow external text conversion filters for binary files (Resulting diff is unappliable)"
+complete -f -c git -n '__fish_git_using_command format-patch' -l textconv -d "Allow external filters for binary files (Resulting diff is unappliable)"
 complete -f -c git -n '__fish_git_using_command format-patch' -l no-prefix -d "Do not show source or destination prefix"
 complete -f -c git -n '__fish_git_using_command format-patch' -l numbered -s n -d "Name output in [Patch n/m] format, even with a single patch"
 complete -f -c git -n '__fish_git_using_command format-patch' -l no-numbered -s N -d "Name output in [Patch] format, even with multiple patches"
@@ -1754,7 +1754,7 @@ complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subco
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l rebase -d "Rebase current branch onto the superproject's commit"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -s N -l no-fetch -d "Don't fetch new objects from the remote"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l remote -d "Instead of using superproject's SHA-1, use the state of the submodule's remote-tracking branch"
-complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l force -d "Throw away local changes when switching to a different commit and always run checkout"
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l force -d "Discard local changes when switching to a different commit & always run checkout"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from add' -l force -d "Also add ignored submodule path"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from deinit' -l force -d "Remove even with local changes"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from status summary' -l cached -d "Use the commit stored in the index"
@@ -1795,7 +1795,7 @@ complete -f -c git -n '__fish_git_using_command blame' -l incremental -d 'Show t
 complete -r -c git -n '__fish_git_using_command blame' -l contents -d 'Instead of working tree, use the contents of the named file'
 complete -x -c git -n '__fish_git_using_command blame' -l date -d 'Specifies the format used to output dates'
 complete -f -c git -n '__fish_git_using_command blame' -s M -d 'Detect moved or copied lines within a file'
-complete -f -c git -n '__fish_git_using_command blame' -s C -d 'Detect lines moved or copied from other files that were modified in the same commit'
+complete -f -c git -n '__fish_git_using_command blame' -s C -d 'Detect lines moved or copied from other files modified in the same commit'
 complete -f -c git -n '__fish_git_using_command blame' -s h -d 'Show help message'
 complete -f -c git -n '__fish_git_using_command blame' -s c -d 'Use the same output mode as git-annotate'
 complete -f -c git -n '__fish_git_using_command blame' -s f -l show-name -d 'Show the filename in the original commit'

share/completions/gitk.fish

@@ -10,7 +10,7 @@ complete -c gitk -n 'not contains -- -- (commandline -opc)' -l merge -d 'On a me
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l left-right -d 'Mark which side of a symmetric difference a commit is reachable from'
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l full-history -d 'When filtering history with -- path..., do not prune some history'
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l simplify-merges -d 'Hide needless merges from history'
-complete -c gitk -n 'not contains -- -- (commandline -opc)' -l ancestry-path -d 'Only display commits that exist directly on the ancestry chain between the given range'
+complete -c gitk -n 'not contains -- -- (commandline -opc)' -l ancestry-path -d 'Only display commits that exist directly on the ancestry chain between the range'
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l argscmd= -d 'Command to be run to determine th revision range to show'
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l select-commit= -d 'Select the specified commit after loading the graph, instead of HEAD'
 complete -c gitk -n 'not contains -- -- (commandline -opc)' -l select-commit=HEAD -d 'Select the specified commit after loading the graph, instead of HEAD'

share/completions/jest.fish

@@ -15,11 +15,11 @@ complete -f -c jest -l collectCoverageOnlyFrom -d 'Explicit list of paths covera
 complete -f -c jest -l color -d 'Forces test results output color highlighting'
 complete -f -c jest -l colors -d 'Alias for --color'
 complete -c jest -l config -s c -d 'The path to a jest config file'
-complete -f -c jest -l coverage -d 'Indicates that test coverage information be collected and reported in the output'
+complete -f -c jest -l coverage -d 'Indicates that test coverage info be collected and reported in the output'
 complete -f -c jest -l coverageDirectory -d 'The directory where Jest should output its coverage files'
 complete -f -c jest -l coveragePathIgnorePatterns -d 'Pattern of files to ignore'
 complete -f -c jest -l coverageReporters -d 'A list of reporter names that Jest uses when writing coverage reports'
-complete -f -c jest -l coverageThreshold -d 'A JSON with which will be used to configure minimum threshold enforcement for coverage results'
+complete -f -c jest -l coverageThreshold -d 'A JSON used to configure minimum threshold enforcement for coverage results'
 complete -f -c jest -l debug -d 'Print debugging info about your jest config'
 complete -f -c jest -l env -d 'The test environment used for all tests'
 complete -f -c jest -l expand -s e -d 'Use this flag to show full diffs instead of a patch'
@@ -33,9 +33,9 @@ complete -f -c jest -l listTests -d 'Lists all tests Jest will run given the arg
 complete -f -c jest -l logHeapUsage -d 'Logs the heap usage after every test'
 complete -f -c jest -l mapCoverage -d 'Maps code coverage reports against original source code'
 complete -f -c jest -l maxWorkers -s w -d 'Specifies the maximum number of workers'
-complete -f -c jest -l moduleDirectories -d 'Directory names to be searched recursively up from the requiring module''s location'
+complete -f -c jest -l moduleDirectories -d 'Dir names to be searched recursively up from the requiring module''s location'
 complete -f -c jest -l moduleFileExtensions -d 'An array of file extensions your modules use'
-complete -f -c jest -l -moduleNameMapper -d 'A JSON with a map from regular expressions to module names that allow to stub out resources'
+complete -f -c jest -l -moduleNameMapper -d 'A JSON with map from regexps to module names that allow to stub out resources'
 complete -f -c jest -l modulePathIgnorePatterns -d 'Modules to ignore'
 complete -f -c jest -l modulePaths -d 'An alternative API to setting the NODE_PATH env variable'
 complete -f -c jest -l noStackTrace -d 'Disables stack trace in test results output'
@@ -67,7 +67,7 @@ complete -f -c jest -l testRunner -d 'Allows to specify a custom test runner'
 complete -f -c jest -l testURL -d 'This option sets the URL for the jsdom environment'
 complete -f -c jest -l timers -d 'Setting this value to fake value of timers'
 complete -f -c jest -l transform -d 'A JSON string which maps from regular expressions to paths to transformers'
-complete -f -c jest -l transformIgnorePatterns -d 'Regexp patterns that are matched against all source file paths before transformation'
+complete -f -c jest -l transformIgnorePatterns -d 'Regexp patterns matched against all source file paths before transformation'
 complete -f -c jest -l unmockedModulePathPatterns -d 'a regex pattern of module to unmock'
 complete -f -c jest -l updateSnapshot -s u -d 'Use this flag to re-record snapshots'
 complete -f -c jest -l useStderr -d 'Divert all output to stderr'
@@ -77,4 +77,4 @@ complete -f -c jest -l watch -d 'Watch files for changes and rerun tests related
 complete -f -c jest -l watchAll -d 'Watch files for changes and rerun all tests'
 complete -f -c jest -l watchman -d 'Whether to use watchman for file crawling'
 complete -f -c jest -l no-watchman -d 'Disable using watchman for file crawling'
-complete -f -c jest -l detectOpenHandles -d 'Print out remaining open handles preventing Jest from exiting at the end of a test run.'
+complete -f -c jest -l detectOpenHandles -d 'Print out open handles preventing Jest from exiting at the end of a test run'

share/completions/lsof.fish

@@ -4,7 +4,7 @@ complete -c lsof -s A -r -d 'Use alternative name list file'
 complete -c lsof -s b -d 'Avoid kernel functions that might block: lstat, readlink, stat'
 complete -c lsof -s c -d 'Select the listing for processes, whose command begins with string (^ - negate)' -xa '(__fish_complete_proc)'
 complete -c lsof -s C -d 'Do not report any pathname component from kernel\'s namecache'
-complete -c lsof -s d -r -d 'specifies a list of file descriptors (FDs) to exclude from or include in the  output  listing'
+complete -c lsof -s d -r -d 'specifies a list of file descriptors to exclude or include in the output listing'
 complete -c lsof -s D -d 'use of device cache file' -xa '\?\t"report device cache file paths"
 b\t"build the device cache file"
 i\t"ignore the device cache file"

share/completions/lsusb.fish

@@ -4,7 +4,7 @@ end
 
 complete -c lsusb -s v -l verbose -d "Increase verbosity (show descriptors)"
 complete -x -c lsusb -s s -a '(__fish_complete_lsusb)' -d "Show only devices with specified device and/or bus numbers (in decimal)"
-complete -c lsusb -s d -d "Show only devices with the specified vendor and product ID numbers (in hexadecimal)"
+complete -c lsusb -s d -d "Show only devices with the given vendor and product ID numbers (in hexadecimal)"
 complete -c lsusb -s D -l device -d "Selects which device lsusb will examine"
 complete -c lsusb -s t -l tree -d "Dump the physical USB device hierarchy as a tree"
 complete -c lsusb -s V -l version -d "Show version of program"

share/completions/minikube.fish

@@ -142,10 +142,10 @@ complete -c minikube -n "__minikube_using_command service" -l url -d "Display th
 # Sub-command: start
 complete -c minikube -n "__minikube_using_command start" -l container-runtime -d "The container runtime to be used"
 complete -c minikube -n "__minikube_using_command start" -l cpus -d "Number of CPUs allocated to the minikube VM (default 2)"
-complete -c minikube -n "__minikube_using_command start" -l disk-size -d "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g) (default 20g)"
+complete -c minikube -n "__minikube_using_command start" -l disk-size -d "Disk size allocated to the minikube VM (format: <number>[<unit>]) (default 20g)"
 complete -c minikube -n "__minikube_using_command start" -l docker-env -d "Environment variables to pass to the Docker daemon (format: key=value)"
-complete -c minikube -n "__minikube_using_command start" -l extra-config -d "A set of key=value pairs that describe configuration that may be passed to different components"
-complete -c minikube -n "__minikube_using_command start" -l feature-gates -d "A set of key=value pairs that describe feature gates for alpha/experimental features"
+complete -c minikube -n "__minikube_using_command start" -l extra-config -d "key=value pairs that describe config that may be passed to different components"
+complete -c minikube -n "__minikube_using_command start" -l feature-gates -d "key=value pairs that describe feature gates for alpha/experimental features"
 complete -c minikube -n "__minikube_using_command start" -l insecure-registry -d "Insecure Docker registries to pass to the Docker daemon"
 complete -c minikube -n "__minikube_using_command start" -l iso-url -d "Location of the minikube iso"
 complete -c minikube -n "__minikube_using_command start" -l keep-context -d "Keep the existing kubectl context and create a minikube context instead"