On Sun, Apr 17, 2011 at 04:39, Junio C Hamano <gitster@xxxxxxxxx> wrote: > So to conclude,... > >>> + Â Â Â cherry-picked from. ÂThis is done only for cherry >>> Â Â Â Âpicks without conflicts. ÂDo not use this option if >>> Â Â Â Âyou are cherry-picking from your private branch because >>> Â Â Â Âthe information is useless to the recipient. ÂIf on the > > ... we could just remove the "This is done only for cherry picks without > conflicts." ÂWe could explain that the user may want to remove the line > depending on the nature of the conflict resolution, but I guess it can > be left without saying. Still, I believe it would be more consistent to do this change as part of the CHERRY_PICK_HEAD series itself, then. -- Sebastian Schuberth -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html