aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-commit.el
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-03-01 17:23:42 +0100
committerJonas Bernoulli <jonas@bernoul.li>2025-03-01 17:23:42 +0100
commit1e986bdbf2126167d1bd6ef51d90907a2dd0a644 (patch)
tree671d95aa68ecd0f628b169e4eaf1f79f258a0bc1 /lisp/magit-commit.el
parentf37d670bb8f4cdd2a86e4185d7d2cd62e9d979a1 (diff)
magit-commit: Add magit-rebase-reword-commit but hide it by default
This command is also available from the `magit-rebase' menu, and has been for a long time. In the context of `magit-commit' it is the missing "Instant Reword" variant, which one might expect to find here, accompanying "Instant Fixup" and "Instant Squash". Do not make it available by default because it is different from all other commands in this menu, in that it does not create a commit in the presence which is send (whether instantly or later) into the past. In contrast, this command has you immediately hop into a time machine and only once you have arrived at your destiny, can you start messing with the timeline. While this command is unlike its second home neighbors, one can tell that "Rebase to modify/reword/remove a commit" all grew up in the same neighborhood, despite their diverging interests.
Diffstat (limited to 'lisp/magit-commit.el')
-rw-r--r--lisp/magit-commit.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 1b0c4fb..e8b8438 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -148,7 +148,10 @@ Also see https://github.com/magit/magit/issues/4132."
("W" "Revise" magit-commit-revise)]
["Edit and rebase"
("F" "Instant fixup" magit-commit-instant-fixup)
- ("S" "Instant squash" magit-commit-instant-squash)]
+ ("S" "Instant squash" magit-commit-instant-squash)
+ ""
+ ""
+ ("R" "Reword past" magit-rebase-reword-commit :level 0)]
["Spread across commits"
("x" "Modified files" magit-commit-autofixup :level 6)
("X" "Updated modules" magit-commit-absorb-modules :level 6)]]