Просмотр исходного кода

Merge branch 'main' into p-git_repos

Preston Thorpe 2 лет назад
Родитель
Сommit
8bb93221ba
4 измененных файлов с 11 добавлено и 5 удалено
  1. 2 2
      Cargo.lock
  2. 2 2
      Cargo.toml
  3. 1 1
      README.md
  4. 6 0
      man/eza.1.md

+ 2 - 2
Cargo.lock

@@ -121,9 +121,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 
 [[package]]
 [[package]]
 name = "chrono"
 name = "chrono"
-version = "0.4.27"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8"
+checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
 dependencies = [
 dependencies = [
  "android-tzdata",
  "android-tzdata",
  "iana-time-zone",
  "iana-time-zone",

+ 2 - 2
Cargo.toml

@@ -38,7 +38,7 @@ name = "eza"
 [dependencies]
 [dependencies]
 ansiterm = "0.12.2"
 ansiterm = "0.12.2"
 gethostname = "0.4.3"
 gethostname = "0.4.3"
-chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.30", default-features = false, features = ["clock"] }
 glob = "0.3"
 glob = "0.3"
 lazy_static = "1.3"
 lazy_static = "1.3"
 libc = "0.2"
 libc = "0.2"
@@ -68,7 +68,7 @@ proc-mounts = "0.3"
 uzers = "0.11.3"
 uzers = "0.11.3"
 
 
 [build-dependencies]
 [build-dependencies]
-chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.30", default-features = false, features = ["clock"] }
 
 
 [dev-dependencies]
 [dev-dependencies]
 trycmd = "0.14"
 trycmd = "0.14"

+ 1 - 1
README.md

@@ -100,7 +100,7 @@ key is in this repo under [deb.asc](/deb.asc).
 
 
 To install eza from this repo use:
 To install eza from this repo use:
 ```bash
 ```bash
-wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo tee /etc/apt/trusted.gpg.d/gierens.asc
+wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/gierens.asc
 echo "deb http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
 echo "deb http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
 sudo apt update
 sudo apt update
 sudo apt install -y eza
 sudo apt install -y eza

+ 6 - 0
man/eza.1.md

@@ -198,6 +198,12 @@ These options are available when running with `--long` (`-l`):
 `--git`  [if eza was built with git support]
 `--git`  [if eza was built with git support]
 : List each file’s Git status, if tracked.
 : List each file’s Git status, if tracked.
 
 
+`--git-repos` [if eza was built with git support]
+: List each directory’s Git status, if tracked.
+
+`--git-repos-no-status` [if eza was built with git support]
+: List if a directory is a Git repository, but not its status.
+
 This adds a two-character column indicating the staged and unstaged statuses respectively. The status character can be ‘`-`’ for not modified, ‘`M`’ for a modified file, ‘`N`’ for a new file, ‘`D`’ for deleted, ‘`R`’ for renamed, ‘`T`’ for type-change, ‘`I`’ for ignored, and ‘`U`’ for conflicted.
 This adds a two-character column indicating the staged and unstaged statuses respectively. The status character can be ‘`-`’ for not modified, ‘`M`’ for a modified file, ‘`N`’ for a new file, ‘`D`’ for deleted, ‘`R`’ for renamed, ‘`T`’ for type-change, ‘`I`’ for ignored, and ‘`U`’ for conflicted.
 
 
 Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status. Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown. 
 Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status. Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown.