On Fri, Feb 27, 2009 at 09:40:45AM +0100, Bert Wesarg wrote: > On Fri, Feb 27, 2009 at 09:32, Uwe Kleine-König > <u.kleine-koenig@xxxxxxxxxxxxxx> wrote: > > What about the patch below? It seems git-checkout from 1.6.x merges the > > changes done to the newly checked out branch. > Thank you very much. It works here as expected. After some more thought I don't think this is the right fix. While throwing away changes to .top* looks OK, doing the same for other changes seems not right to me. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- 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