Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-20 Thread Elijah Newren
Hi Eric, On Sun, Jun 17, 2018 at 10:15 AM, Eric Sunshine wrote: > On Sun, Jun 17, 2018 at 1:59 AM Elijah Newren wrote: >> git rebase has many options that only work with one of its three backends. >> It also has a few other pairs of incompatible options. Document these. >> >> Signed-off-by:

Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-20 Thread Elijah Newren
On Sun, Jun 17, 2018 at 8:38 AM, Phillip Wood wrote: >> +Other incompatible flag pairs: >> + >> + * --preserve-merges && --interactive >> + * --preserve-merges && --signoff >> + * --preserve-merges && --rebase-merges >> + * --rebase-merges && --strategy > > Does --rebase-merges support

Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-17 Thread Eric Sunshine
On Sun, Jun 17, 2018 at 1:59 AM Elijah Newren wrote: > git rebase has many options that only work with one of its three backends. > It also has a few other pairs of incompatible options. Document these. > > Signed-off-by: Elijah Newren > --- > diff --git a/Documentation/git-rebase.txt

Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-17 Thread Phillip Wood
Hi Elijah On 17/06/18 06:58, Elijah Newren wrote: git rebase has many options that only work with one of its three backends. It also has a few other pairs of incompatible options. Document these. Signed-off-by: Elijah Newren --- Documentation/git-rebase.txt | 84

[RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-16 Thread Elijah Newren
git rebase has many options that only work with one of its three backends. It also has a few other pairs of incompatible options. Document these. Signed-off-by: Elijah Newren --- Documentation/git-rebase.txt | 84 1 file changed, 76 insertions(+), 8