浏览代码

Merge branch 'main' into eza-env-vars

Christina Sørensen 2 年之前
父节点
当前提交
1293b771cc
共有 5 个文件被更改,包括 14 次插入12 次删除
  1. 1 1
      .github/workflows/conventional-commits.yml
  2. 6 6
      Cargo.lock
  3. 3 3
      Cargo.toml
  4. 3 1
      README.md
  5. 1 1
      man/eza_colors.5.md

+ 1 - 1
.github/workflows/conventional-commits.yml

@@ -11,7 +11,7 @@ jobs:
     name: Conventional Commits
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: webiny/action-conventional-commits@v1.1.0
         # optional, required for private repos

+ 6 - 6
Cargo.lock

@@ -142,9 +142,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.30"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -583,9 +583,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "libgit2-sys"
@@ -1149,9 +1149,9 @@ dependencies = [
 
 [[package]]
 name = "timeago"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5082dc942361cdfb74eab98bf995762d6015e5bb3a20bf7c5c71213778b4fcb4"
+checksum = "a1710e589de0a76aaf295cd47a6699f6405737dbfd3cf2b75c92d000b548d0e6"
 
 [[package]]
 name = "tinytemplate"

+ 3 - 3
Cargo.toml

@@ -39,7 +39,7 @@ name = "eza"
 [dependencies]
 ansiterm = "0.12.2"
 gethostname = "0.4.3"
-chrono = { version = "0.4.30", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
 glob = "0.3"
 lazy_static = "1.3"
 libc = "0.2"
@@ -52,7 +52,7 @@ phf = { version = "0.11.2", features = ["macros"]}
 scoped_threadpool = "0.1"
 term_grid = "0.1"
 terminal_size = "0.2.6"
-timeago = { version = "0.4.1", default-features = false }
+timeago = { version = "0.4.2", default-features = false }
 unicode-width = "0.1"
 urlencoding = "2.1.3"
 zoneinfo_compiled = "0.5.1"
@@ -69,7 +69,7 @@ proc-mounts = "0.3"
 uzers = "0.11.3"
 
 [build-dependencies]
-chrono = { version = "0.4.30", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }

+ 3 - 1
README.md

@@ -302,7 +302,7 @@ These options are available when running with `--long` (`-l`):
 - **-H**, **--links**: list each file’s number of hard links
 - **-i**, **--inode**: list each file’s inode number
 - **-m**, **--modified**: use the modified timestamp field
-- **-M**, **--mounts**: Show mount details (Linux only).
+- **-M**, **--mounts**: Show mount details (Linux and MacOS only).
 - **-S**, **--blocksize**: show size of allocated file system blocks
 - **-t**, **--time=(field)**: which timestamp field to use
 - **-u**, **--accessed**: use the accessed timestamp field
@@ -312,6 +312,8 @@ These options are available when running with `--long` (`-l`):
 - **-@**, **--extended**: list each file’s extended attributes and sizes
 - **--changed**: use the changed timestamp field
 - **--git**: list each file’s Git status, if tracked or ignored
+- **--git-repos**: list each directory’s Git status, if tracked
+- **--git-repos-no-status**:  list whether a directory is a Git repository, but not its status (faster)
 - **--no-git**: suppress Git status (always overrides `--git`, `--git-repos`, `--git-repos-no-status`)
 - **--time-style**: how to format timestamps
 - **--no-permissions**: suppress the permissions field

+ 1 - 1
man/eza_colors.5.md

@@ -244,7 +244,7 @@ LIST OF CODES
 : a regular file that is a document (ex: office suite document or PDF)
 
 `co`
-: a regular file this is compressed
+: a regular file that is compressed
 
 `tm`
 : a regular file that is temporary (ex: a text editor's backup file)