Skip to contentSkip to conversation

rebase: fix typo in autosquash documentation

PATCH In review Richard Macklin via GitGitGadget 2 participants 2 messages Feb 27, 2024 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rebase: fix typo in autosquash documentation

From: Richard Macklin <[email protected]>

This is a minor follow-up to cb00f524df (rebase: rewrite --(no-)autosquash documentation, 2023-11-14) to fix a typo introduced in that commit.

---
rebase: fix typo in autosquash documentation

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1676%2Frmacklin%2Ffix-typo-in-rebase-documentation-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1676/rmacklin/fix-typo-in-rebase-documentation-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1676

 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-rebase.txt +1 -1
index 06206521fc3..e7e725044db 100644
@@ -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.
 +

base-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 8 lines · Richard Macklin via GitGitGadget

From: Richard Macklin <[email protected]>

This is a minor follow-up to cb00f524df (rebase: rewrite --(no-)autosquash documentation, 2023-11-14) to fix a typo introduced in that commit.

---

[jc: andy cc'ed as the original author to give him a chance to give his Acked-by]

Documentation/git-rebase.txt The recommended way to create commits with squash markers is by using the · line 610

Quoted 13 lines
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-rebase.txt +1 -1
index 06206521fc3..e7e725044db 100644
@@ -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

Good eyes. Thanks for fixing.

Quoted 5 lines
Documentation/git-rebase.txt +0 -0
 auto-squashing by default for interactive rebase.  The `--no-autosquash`
 option can be used to override that setting.
 +

base-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0