branch: elpa/magit
commit 31afaddc07b2a9808178d4c59d8c896146d4dfad
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>

    magit-log-remove-graph-args: Remove --grep from list
    
    We don't know since when "--grep" and "--graph" are no longer
    mutually exclusive, but it is since before Git v2.25.0, which
    is the minimal version required by Magit.
    
    Closes #5391.
---
 lisp/magit-log.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 28266d6254..eaff50bd08 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -78,7 +78,7 @@
   :group 'magit-log
   :type 'hook)
 
-(defcustom magit-log-remove-graph-args '("--follow" "--grep" "-G" "-S" "-L")
+(defcustom magit-log-remove-graph-args '("--follow" "-G" "-S" "-L")
   "The log arguments that cause the `--graph' argument to be dropped.
 
 The default value lists the arguments that are incompatible with
@@ -87,10 +87,10 @@ can add additional arguments that are available in 
`magit-log',
 but I recommend that you don't do that.  Nowadays I would define
 this as a constant, but I am preserving it as an option, in case
 someone actually customized it."
-  :package-version '(magit . "2.3.0")
+  :package-version '(magit . "4.3.7")
   :group 'magit-log
   :type '(repeat (string :tag "Argument"))
-  :options '("--follow" "--grep" "-G" "-S" "-L"))
+  :options '("--follow" "-G" "-S" "-L"))
 
 (defcustom magit-log-revision-headers-format "\
 %+b%+N

Reply via email to