Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-07 Thread Felipe Contreras
On Thu, Jun 6, 2013 at 2:21 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. And a

[PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-06 Thread Felipe Contreras
Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 8 sequencer.c | 6 ++ sequencer.h | 1 +

Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-06 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. And a bit more, isn't it? The --keep-redundant-commits option implies the --allow-empty option and it was perfectly acceptable to give both. By making sure that only at most one of -k-r-d, -a-e or -s-e is

Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-06 Thread Felipe Contreras
On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. And a bit more, isn't it? The --keep-redundant-commits option implies the --allow-empty option and it was perfectly acceptable to

Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-06 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. And a bit more, isn't it? The --keep-redundant-commits option implies the

Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

2013-06-06 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. And a bit more, isn't it? The --keep-redundant-commits option implies the