Re: [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag

2019-10-06 Thread Rohit Ashiwal
Hi Phillip On Fri, 4 Oct 2019 10:29:36 +0100 Phillip Wood wrote: > > [...] > --rebase-merges now supports --strategy_option so we should fix this. Yes, now that it supports --strategy_options I'll remove it from here. > [...] Thanks Rohit

Re: [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag

2019-10-05 Thread Elijah Newren
On Fri, Oct 4, 2019 at 2:29 AM Phillip Wood wrote: > > Hi Rohit > > On 07/09/2019 12:50, Rohit Ashiwal wrote: > > There are two backends available for rebasing, viz, the am and the > > interactive. Naturally, there shall be some features that are > > implemented in one but not in the other. One su

Re: [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag

2019-10-04 Thread Phillip Wood
Hi Rohit On 07/09/2019 12:50, Rohit Ashiwal wrote: There are two backends available for rebasing, viz, the am and the interactive. Naturally, there shall be some features that are implemented in one but not in the other. One such flag is --ignore-whitespace which indicates merge mechanism to tre

[PATCH v4 1/6] rebase -i: add --ignore-whitespace flag

2019-09-07 Thread Rohit Ashiwal
There are two backends available for rebasing, viz, the am and the interactive. Naturally, there shall be some features that are implemented in one but not in the other. One such flag is --ignore-whitespace which indicates merge mechanism to treat lines with only whitespace changes as unchanged. Wi