From 40b8076462b9f977a88d21609d8f1c99d0d2ca33 Mon Sep 17 00:00:00 2001 From: Richard Macklin Date: Tue, 27 Feb 2024 06:32:58 +0000 Subject: [PATCH] rebase: fix typo in autosquash documentation This is a minor follow-up to cb00f524df (rebase: rewrite --(no-)autosquash documentation, 2023-11-14) to fix a typo introduced in that commit. Signed-off-by: Richard Macklin Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1dd6555f66..ba96fb5714 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -607,7 +607,7 @@ The recommended way to create commits with squash markers is by using the linkgit:git-commit[1], which take the target commit as an argument and automatically fill in the subject line of the new commit from that. + -Settting configuration variable `rebase.autoSquash` to true enables +Setting configuration variable `rebase.autoSquash` to true enables auto-squashing by default for interactive rebase. The `--no-autosquash` option can be used to override that setting. + -- 2.39.5