Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-06-22 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >> When cherry-picking multiple commits, it's impossible to have both >> merge- and non-merge commits on the same command-line. Not specifying >> '-m 1' results in cherry-pick refusing to handle merge commits, while >> specifying '-m 1' fails on

Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-06-21 Thread Junio C Hamano
Sergey Organov writes: > When cherry-picking multiple commits, it's impossible to have both > merge- and non-merge commits on the same command-line. Not specifying > '-m 1' results in cherry-pick refusing to handle merge commits, while > specifying '-m 1' fails on non-merge commits. Allowing

[PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-06-21 Thread Sergey Organov
When cherry-picking multiple commits, it's impossible to have both merge- and non-merge commits on the same command-line. Not specifying '-m 1' results in cherry-pick refusing to handle merge commits, while specifying '-m 1' fails on non-merge commits. This patch allows '-m 1' for non-merge

[PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-05-25 Thread Sergey Organov
When cherry-picking multiple commits, it's impossible to have both merge- and non-merge commits on the same command-line. Not specifying '-m 1' results in cherry-pick refusing to handle merge commits, while specifying '-m 1' fails on non-merge commits. This patch allows '-m 1' for non-merge