Junio C Hamano <gitster@xxxxxxxxx> writes: > Sergey Organov <sorganov@xxxxxxxxx> 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 "-m1" even when picking a single parent commit, because > the 1-st parent is defined for such a commit, makes sense, espeially > when running a cherry-pick on a range, exactly for the above reason. > It is slightly less so when cherry-picking a single commit, but not > by a large margin. [...] >> + } else if (1 < opts->mainline) >> + /* Non-first parent explicitly specified as mainline for >> + * non-merge commit */ > > Style. > > /* > * Our multi-line comments are to be > * formatted like this. > */ Ah, sorry for that. Will you fix it for me? Thanks! -- Sergey
