aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-02-10 00:18:19 +0100
committerJonas Bernoulli <jonas@bernoul.li>2025-02-10 00:18:19 +0100
commit689716648c883d546a018c9bb550f1179941c94b (patch)
tree728cba09916ae186e9324fd4ec8de5b255a8df02
parent1b169115ba0e5d2a758aa8b54c221adfabeb6917 (diff)
magit:--signoff: Use different key to avoid conflicts
-rw-r--r--CHANGELOG3
-rw-r--r--lisp/magit.el1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bf6b6b0..1117135 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,9 @@ Bugfixes:
- Some arguments were missing from diff menus when invoked from
the status buffer. #5309
+- In some menus the bindings for ~--signoff~ conflicted with those for
+ other arguments. #5312
+
* v4.3.0 2025-02-04
- Added new option ~magit-refs-show-branch-descriptions~. 42ed6c1966
diff --git a/lisp/magit.el b/lisp/magit.el
index 3f721ac..c076f4d 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -504,6 +504,7 @@ is run in the top-level directory of the current working tree."
(transient-define-argument magit:--signoff ()
:description "Add Signed-off-by trailer"
:class 'transient-switch
+ :key "+s"
:shortarg "-s"
:argument "--signoff"
:level 6)