threads / patch / 61013

patchrebase: fix typo in autosquash documentation

Subject: [PATCH] rebase: fix typo in autosquash documentation

## tl;dr

2 messages between Feb 27, 2024 and Feb 27, 2024. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Richard Macklin via GitGitGadget· Feb 27, 2024, 06:32 UTC · lore

From: Richard Macklin <code@rmacklin.dev>

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>
---
    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(-)

Show changes to Documentation/git-rebase.txt +1 −1

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 06206521fc3..e7e725044db 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.
 +

base-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0

-- 
gitgitgadget

Junio C Hamano· Feb 27, 2024, 16:50 UTC · re: Richard Macklin via GitGitGadget · lore

Re: [PATCH] rebase: fix typo in autosquash documentation

"Richard Macklin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines

> From: Richard Macklin <code@rmacklin.dev>
>
> 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>
> ---

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

Show 13 quoted lines

>  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 06206521fc3..e7e725044db 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

Good eyes.  Thanks for fixing.

Show 5 quoted lines

>  auto-squashing by default for interactive rebase.  The `--no-autosquash`
>  option can be used to override that setting.
>  +
>
> base-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0