aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-03-31 16:12:17 +0200
committerJonas Bernoulli <jonas@bernoul.li>2025-03-31 16:12:17 +0200
commit4fed8d67a5a2edcf541aab6495542e23aff42f9b (patch)
tree525324f298b211c0dd5a0f878fc6575a09fb3490 /docs
parent64e69ea809042a1182c7a0b3e92c1f7c6b4f8b6b (diff)
magit-rebase-autosquash: With a prefix allow selecting beginning
Diffstat (limited to 'docs')
-rw-r--r--docs/magit.org5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/magit.org b/docs/magit.org
index 19d86ad..ea86633 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -6014,6 +6014,11 @@ is not enabled in the transient.
This command combines squash and fixup commits with their intended
targets.
+ By default only commits that are not reachable from the upstream
+ branch are potentially squashed into. If no upstream is configured
+ or with a prefix argument, the user is prompted for the first commit
+ to potentially squash into.
+
- Key: r m (magit-rebase-edit-commit) ::
This command starts an interactive rebase sequence that lets the