Re: [PATCH] rebase: fix typo in autosquash documentation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 27, 2024, 16:50 UTC
- Message-ID
- <xmqqv869vokg.fsf@gitster.g>
- In-Reply-To
- <pull.1676.git.1709015578890.gitgitgadget@gmail.com>
"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