git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Richard Macklin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Richard Macklin <code@rmacklin.dev>,
	Andy Koppe <andy.koppe@gmail.com>
Subject: Re: [PATCH] rebase: fix typo in autosquash documentation
Date: Tue, 27 Feb 2024 08:50:39 -0800	[thread overview]
Message-ID: <xmqqv869vokg.fsf@gitster.g> (raw)
In-Reply-To: <pull.1676.git.1709015578890.gitgitgadget@gmail.com> (Richard Macklin via GitGitGadget's message of "Tue, 27 Feb 2024 06:32:58 +0000")

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

> 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]

>  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.

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

      reply	other threads:[~2024-02-27 16:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27  6:32 [PATCH] rebase: fix typo in autosquash documentation Richard Macklin via GitGitGadget
2024-02-27 16:50 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqv869vokg.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=andy.koppe@gmail.com \
    --cc=code@rmacklin.dev \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).