Re: [PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support

2018-07-12 Thread Johannes Schindelin
Hi Elijah, On Wed, 11 Jul 2018, Elijah Newren wrote: > On Fri, Mar 9, 2018 at 8:36 AM, Johannes Schindelin via GitGitGadget > wrote: > > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > > index 0e20a66e7..c4bcd24bb 100644 > > --- a/Documentation/git-rebase.txt > >

Re: [PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support

2018-07-11 Thread Elijah Newren
Hi Dscho, On Fri, Mar 9, 2018 at 8:36 AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Now that we support octopus merges in the `--rebase-merges` mode, > we should give users who actually read the manuals a chance to know > about this fact. > > Signed-off-by:

[PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support

2018-07-11 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Now that we support octopus merges in the `--rebase-merges` mode, we should give users who actually read the manuals a chance to know about this fact. Signed-off-by: Johannes Schindelin --- Documentation/git-rebase.txt | 7 --- 1 file changed, 4 insertions(+), 3