Re: [PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-12 Thread Phillip Wood
On 11/06/18 16:49, Elijah Newren wrote: > Another thing I missed... > > On Sun, Jun 10, 2018 at 12:40 PM, Phillip Wood > wrote: >> On 07/06/18 06:06, Elijah Newren wrote: > >>> Some exceptions I left out: >>> >>>* --merge and --interactive are technically incompatible since they are >>>

Re: [PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-11 Thread Phillip Wood
On 11/06/18 16:19, Elijah Newren wrote: Hi Phillip On Sun, Jun 10, 2018 at 12:40 PM, Phillip Wood wrote: Documentation/git-rebase.txt | 15 +-- git-rebase.sh | 17 + t/t3422-rebase-incompatible-options.sh | 10 +-

Re: [PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-11 Thread Elijah Newren
Another thing I missed... On Sun, Jun 10, 2018 at 12:40 PM, Phillip Wood wrote: > On 07/06/18 06:06, Elijah Newren wrote: >> Some exceptions I left out: >> >>* --merge and --interactive are technically incompatible since they are >> supposed to run different underlying scripts, but

Re: [PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-11 Thread Elijah Newren
Hi Phillip On Sun, Jun 10, 2018 at 12:40 PM, Phillip Wood wrote: >> Documentation/git-rebase.txt | 15 +-- >> git-rebase.sh | 17 + >> t/t3422-rebase-incompatible-options.sh | 10 +- >> 3 files changed, 35

Re: [PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-10 Thread Phillip Wood
On 07/06/18 06:06, Elijah Newren wrote: git rebase has three different types: am, merge, and interactive, all of which are implemented in terms of separate scripts. am builds on git-am, merge builds on git-merge-recursive, and interactive builds on git-cherry-pick. We make use of features in

[PATCH 2/2] git-rebase: error out when incompatible options passed

2018-06-06 Thread Elijah Newren
git rebase has three different types: am, merge, and interactive, all of which are implemented in terms of separate scripts. am builds on git-am, merge builds on git-merge-recursive, and interactive builds on git-cherry-pick. We make use of features in those lower-level commands in the different