* [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.
@ 2019-02-13 23:44 Emilio Cobos Álvarez
2019-02-14 16:38 ` Elijah Newren
0 siblings, 1 reply; 2+ messages in thread
From: Emilio Cobos Álvarez @ 2019-02-13 23:44 UTC (permalink / raw)
To: git; +Cc: Emilio Cobos Álvarez
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.
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
0 siblings, 0 replies; 2+ messages in thread
From: Elijah Newren @ 2019-02-14 16:38 UTC (permalink / raw)
To: Emilio Cobos Álvarez; +Cc: Git Mailing List
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-14 16:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).