From: Robin Rosenberg Date: Wed, 05 Jan 2011 06:31:05 GMT Subject: Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs Message-ID: <24C35180-AED6-4848-9F05-908831F911F9@dewire.com> In-Reply-To: <20101229141638.GA14865@pengutronix.de> 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