From c9dc61771149704bf8b0f5dbe9245e8b2f7a3390 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Fri, 3 Apr 2020 09:39:33 +0200
Subject: [PATCH] Rename --list to --list-details

---
 CHANGELOG.md |  4 ++--
 doc/fd.1     |  2 +-
 src/app.rs   | 14 +++++++-------
 src/main.rs  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82ae9be..66f8d42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 ## Features
 
-- Add a new `-l`/`--list` option to show more details about the search results. This is basically
-  an alias for `--exec-batch ls -l` with some additional `ls` options.
+- Add a new `-l`/`--list-details` option to show more details about the search results. This is
+  basically an alias for `--exec-batch ls -l` with some additional `ls` options.
   This can be used in order to:
     * see metadata like permissions, owner, file size, modification times (#491)
     * see symlink targets (#482)
diff --git a/doc/fd.1 b/doc/fd.1
index 974a4f4..5a04b74 100644
--- a/doc/fd.1
+++ b/doc/fd.1
@@ -66,7 +66,7 @@ Treat the pattern as a literal string instead of a regular expression.
 .B \-a, \-\-absolute\-path
 Shows the full path starting from the root as opposed to relative paths.
 .TP
-.B \-l, \-\-list
+.B \-l, \-\-list\-details
 Use a detailed listing format like 'ls -l'. This is basically an alias
 for '--exec-batch ls -l' with some additional 'ls' options. This can be used
 to see more metadata, to show symlink targets, to achieve a deterministic
diff --git a/src/app.rs b/src/app.rs
index 4a391f5..ef92a30 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -109,8 +109,8 @@ pub fn build_app() -> App<'static, 'static> {
                 .overrides_with("absolute-path"),
         )
         .arg(
-            arg("list")
-                .long("list")
+            arg("list-details")
+                .long("list-details")
                 .short("l")
                 .conflicts_with("absolute-path"),
         )
@@ -132,7 +132,7 @@ pub fn build_app() -> App<'static, 'static> {
                 .long("print0")
                 .short("0")
                 .overrides_with("print0")
-                .conflicts_with("list"),
+                .conflicts_with("list-details"),
         )
         .arg(arg("depth").long("max-depth").short("d").takes_value(true))
         // support --maxdepth as well, for compatibility with rg
@@ -181,7 +181,7 @@ pub fn build_app() -> App<'static, 'static> {
                 .allow_hyphen_values(true)
                 .value_terminator(";")
                 .value_name("cmd")
-                .conflicts_with("list"),
+                .conflicts_with("list-details"),
         )
         .arg(
             arg("exec-batch")
@@ -191,7 +191,7 @@ pub fn build_app() -> App<'static, 'static> {
                 .allow_hyphen_values(true)
                 .value_terminator(";")
                 .value_name("cmd")
-                .conflicts_with_all(&["exec", "list"]),
+                .conflicts_with_all(&["exec", "list-details"]),
         )
         .arg(
             arg("exclude")
@@ -351,8 +351,8 @@ fn usage() -> HashMap<&'static str, Help> {
     doc!(h, "absolute-path"
         , "Show absolute instead of relative paths"
         , "Shows the full path starting from the root as opposed to relative paths.");
-    doc!(h, "list"
-        , "Use a detailed listing format"
+    doc!(h, "list-details"
+        , "Show details like permissions, owner, size and modification time."
         , "Use a detailed listing format like 'ls -l'. This is basically an alias \
            for '--exec-batch ls -l' with some additional 'ls' options. This can be used \
            to see more metadata, to show symlink targets, to achieve a deterministic \
diff --git a/src/main.rs b/src/main.rs
index cbf90f0..c6855b7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -167,7 +167,7 @@ fn main() {
             })
         })
         .or_else(|| {
-            if matches.is_present("list") {
+            if matches.is_present("list-details") {
                 let color = matches.value_of("color").unwrap_or("auto");
                 let color_arg = ["--color=", color].concat();