Merge branch 'main' into add-env-var-to-override-git

completions/bash/eza

@@ -4,7 +4,7 @@ _eza() {
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     case "$prev" in
-        -'?'|--help|-v|--version)
+        --help|-v|--version)
             return
             ;;
 

completions/nush/eza.nu

@@ -1,6 +1,6 @@
 export extern "eza" [
     --version(-v)              # Show version of eza
-    --help(-?)                 # Show list of command-line options
+    --help                     # Show list of command-line options
     --oneline(-1)              # Display one entry per line
     --long(-l)                 # Display extended file metadata as a table
     --grid(-G)                 # Display entries in a grid
@@ -8,6 +8,10 @@ export extern "eza" [
     --recurse(-R)              # Recurse into directories
     --tree(-T)                 # Recurse into directories as a tree
     --classify(-F)             # Display type indicator by file names
+    --color                    # When to use terminal colours
+    --colour                   # When to use terminal colours
+    --color-scale              # Highlight levels of file sizes distinctly
+    --colour-scale             # Highlight levels of file sizes distinctly
     --icons                    # Display icons
     --no-icons                 # Don't display icons
     --no-quotes                # Don't quote file names with spaces
@@ -19,6 +23,7 @@ export extern "eza" [
     --level(-L): string        # Limit the depth of recursion
     --width(-w)                # Limits column output of grid, 0 implies auto-width
     --reverse(-r)              # Reverse the sort order
+    --sort(-s)                 # Which field to sort by
     --only-dirs(-D)            # List only directories
     --only-files(-f)           # List only files
     --binary(-b)               # List file sizes with binary prefixes
@@ -28,12 +33,14 @@ export extern "eza" [
     --links(-H)                # List each file's number of hard links
     --inode(-i)                # List each file's inode number
     --blocksize(-S)            # List each file's size of allocated file system blocks
+    --time(-t) -d              # Which timestamp field to list
     --dereference(-X)          # dereference symlinks for file information
     --modified(-m)             # Use the modified timestamp field
     --numeric(-n)              # List numeric user and group IDs.
     --changed                  # Use the changed timestamp field
     --accessed(-u)             # Use the accessed timestamp field
     --created(-U)              # Use the created timestamp field
+    --time-style               # How to format timestamps
     --no-permissions           # Suppress the permissions field
     --octal-permissions(-o)    # List each file's permission in octal format
     --no-filesize              # Suppress the filesize field

completions/zsh/_eza

@@ -11,7 +11,7 @@ __eza() {
     # `-S` for delimiting options with `--` like in `eza -- -a`.
     _arguments -s -S \
         "(- *)"{-v,--version}"[Show version of eza]" \
-        "(- *)"{-'\?',--help}"[Show list of command-line options]" \
+        "(- *)"{--help}"[Show list of command-line options]" \
         {-1,--oneline}"[Display one entry per line]" \
         {-l,--long}"[Display extended file metadata as a table]" \
         {-G,--grid}"[Display entries as a grid]" \

man/eza.1.md

@@ -38,6 +38,16 @@ EXAMPLES
 : Displays a tree of files, three levels deep, as well as each file’s metadata.
 
 
+META OPTIONS
+===============
+
+`--help`
+: Show list of command-line options.
+
+`-v`, `--version`
+: Show version of eza.
+
+
 DISPLAY OPTIONS
 ===============
 
@@ -59,6 +69,9 @@ DISPLAY OPTIONS
 `-T`, `--tree`
 : Recurse into directories as a tree.
 
+`-X`, `--dereference`
+: Dereference symbolic links when displaying information.
+
 `-x`, `--across`
 : Sort the grid across, rather than downwards.
 
@@ -98,6 +111,9 @@ FILTERING AND SORTING OPTIONS
 : Show hidden and “dot” files.
 Use this twice to also show the ‘`.`’ and ‘`..`’ directories.
 
+`-A`, `--almost-all`
+: Equivalent to --all; included for compatibility with `ls -A`.
+
 `-d`, `--list-dirs`
 : List directories as regular files, rather than recursing and listing their contents.
 

src/options/help.rs

@@ -8,7 +8,7 @@ static USAGE_PART1: &str = "Usage:
   eza [options] [files...]
 
 META OPTIONS
-  -?, --help         show list of command-line options
+  --help             show list of command-line options
   -v, --version      show version of eza
 
 DISPLAY OPTIONS
@@ -18,6 +18,7 @@ DISPLAY OPTIONS
   -x, --across       sort the grid across, rather than downwards
   -R, --recurse      recurse into directories
   -T, --tree         recurse into directories as a tree
+  -X, --dereference  dereference symbolic links when displaying information
   -F, --classify     display type indicator by file names
   --colo[u]r=WHEN    when to use terminal colours (always, auto, never)
   --colo[u]r-scale   highlight levels of file sizes distinctly
@@ -27,8 +28,10 @@ DISPLAY OPTIONS
   --hyperlink        display entries as hyperlinks
   -w, --width COLS   set screen width in columns
 
+
 FILTERING AND SORTING OPTIONS
   -a, --all                  show hidden and 'dot' files. Use this twice to also show the '.' and '..' directories
+  -A, --almost-all           equivalent to --all; included for compatibility with `ls -A`
   -d, --list-dirs            list directories as files; don't list their contents
   -L, --level DEPTH          limit the depth of recursion
   -r, --reverse              reverse the sort order