Re: [RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive

2018-06-11 Thread Phillip Wood
Hi Elijah On 10/06/18 02:14, Elijah Newren wrote: > > Hi Dscho, > > On Sat, Jun 9, 2018 at 3:04 PM, Johannes Schindelin > wrote: >> On Thu, 7 Jun 2018, Elijah Newren wrote: >> >>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt >>> index 451252c173..28d1658d7a 100644

Re: [RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive

2018-06-09 Thread Elijah Newren
Hi Dscho, On Sat, Jun 9, 2018 at 3:04 PM, Johannes Schindelin wrote: > On Thu, 7 Jun 2018, Elijah Newren wrote: > >> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt >> index 451252c173..28d1658d7a 100644 >> --- a/Documentation/git-rebase.txt >> +++

Re: [RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive

2018-06-09 Thread Johannes Schindelin
Hi Elijah, On Thu, 7 Jun 2018, Elijah Newren wrote: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 451252c173..28d1658d7a 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -275,6 +275,10 @@ branch on top of the branch.

[RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive

2018-06-07 Thread Elijah Newren
Interactive rebases are implemented in terms of cherry-pick rather than the merge-recursive builtin, but cherry-pick also calls into the recursive merge machinery by default and can accept special merge strategies and/or special strategy options. As such, there really is not any need for having