Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

On 03/08/17 18:19, Junio C Hamano wrote: > Phillip Wood writes: > >> On 02/08/17 23:29, Junio C Hamano wrote: >> ... >>> The >>> latter makes it more in line with how "am -3" followed by "am --no-3 >>> --continue" behaves. >> >> I'm a bit confused about what am does

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

Phillip Wood writes: > On 02/08/17 23:29, Junio C Hamano wrote: > ... >> The >> latter makes it more in line with how "am -3" followed by "am --no-3 >> --continue" behaves. > > I'm a bit confused about what am does when you pass extra options to > --continue. It looks

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

Hi Junio Thanks for your comments. On 02/08/17 23:29, Junio C Hamano wrote: > Junio C Hamano writes: > >> Phillip Wood writes: >> >>> From: Phillip Wood >>> >>> cherry-pick and revert should not accept

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

Junio C Hamano writes: > Phillip Wood writes: > >> From: Phillip Wood >> >> cherry-pick and revert should not accept --[no-]rerere-autoupdate once >> they have started. > > Hmph, why shouldn't they? In other words,

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

Phillip Wood writes: > From: Phillip Wood > > cherry-pick and revert should not accept --[no-]rerere-autoupdate once > they have started. Hmph, why shouldn't they? In other words, shouldn't the usual "try to carry forward from the

[PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

From: Phillip Wood cherry-pick and revert should not accept --[no-]rerere-autoupdate once they have started. Signed-off-by: Phillip Wood --- This will break scripts that pass --[no-]rerere-autoupdate to 'git cherry-pick --continue'. I