29 dec 2010 kl. 15:16 skrev Uwe Kleine-König: > Hello, > > when hitting a conflict cherry-pick suggests using > > git commit -c $sha1 > > but the resulting (suggested) commit log doesn't have the extra > reference requested by -x. > The man page says -x only takes effect when you do not have a conflict, so there is no bug. -- robin -- 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