diff options
| author | Richard Macklin <code@rmacklin.dev> | 2024-02-27 06:32:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 08:50:49 -0800 |
| commit | 40b8076462b9f977a88d21609d8f1c99d0d2ca33 (patch) | |
| tree | 225d224ed99f5a24929026324a2e50c538e554f9 | |
| parent | rebase: rewrite --(no-)autosquash documentation (diff) | |
| download | git-40b8076462b9f977a88d21609d8f1c99d0d2ca33.tar.gz git-40b8076462b9f977a88d21609d8f1c99d0d2ca33.zip | |
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 <code@rmacklin.dev>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. + |