Re: [RFC/PATCH v2 0/8] rebase: new cherry-pick mode

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 6:23 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> We already rely on cherry-pick for the 'am' mode, but only when using the >> --keep-empty option, and when in such mode the behavior of 'git rebase' >> changes >> completely; more specifically; it's completely

Re: [RFC/PATCH v2 0/8] rebase: new cherry-pick mode

2013-05-29 Thread Junio C Hamano
Felipe Contreras writes: > We already rely on cherry-pick for the 'am' mode, but only when using the > --keep-empty option, and when in such mode the behavior of 'git rebase' > changes > completely; more specifically; it's completely broken. Manually enabling > --keep-empty to be the default and