Merge branch 'ak/rebase-autosquash'

gitster · gitster · commit 53ac1f106f4f · 2024-03-05T09:44:44.000-08:00
Typofix.

* ak/rebase-autosquash:
  rebase: fix typo in autosquash documentation
diff --git 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.
 +

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ The recommended way to create commits with squash markers is by using the`
`607`	`607`	`linkgit:git-commit[1], which take the target commit as an argument and`
`608`	`608`	`automatically fill in the subject line of the new commit from that.`
`609`	`609`	`+`
`610`		-Settting configuration variable `rebase.autoSquash` to true enables
	`610`	+Setting configuration variable `rebase.autoSquash` to true enables
`611`	`611`	auto-squashing by default for interactive rebase. The `--no-autosquash`
`612`	`612`	`option can be used to override that setting.`
`613`	`613`	`+`