From: Elijah Newren <newren@gmail.com>
To: "Emilio Cobos Álvarez" <emilio@crisal.io>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.
Date: Thu, 14 Feb 2019 08:38:20 -0800 [thread overview]
Message-ID: <CABPp-BFLW5mgPH_Ui3+HGToBtS8eHiAcJ54231_rZ-qC6rOj2g@mail.gmail.com> (raw)
In-Reply-To: <20190213234433.31597-1-emilio@crisal.io>
On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez <emilio@crisal.io> wrote:
>
> The --autosquash option is implied by the earlier --[no-]autosquash
> entry in the list.
>
> Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
> ---
> Documentation/git-rebase.txt | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index daa16403ec..daeaa1d0c7 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -529,7 +529,6 @@ are incompatible with the following options:
> * --interactive
> * --exec
> * --keep-empty
> - * --autosquash
> * --edit-todo
> * --root when used in combination with --onto
>
> --
> 2.20.1
Oops; thanks for catching my mistake.
Reviewed-by: Elijah Newren <newren@gmail.com>
prev parent reply other threads:[~2019-02-14 16:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 23:44 [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list Emilio Cobos Álvarez
2019-02-14 16:38 ` Elijah Newren [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFLW5mgPH_Ui3+HGToBtS8eHiAcJ54231_rZ-qC6rOj2g@mail.gmail.com \
--to=newren@gmail.com \
--cc=emilio@crisal.io \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).