Re: [Synfig-devl] Git situation...how to solve?

2013-10-17 Thread d/j/a/y is free
Carlos, Konstantin, thank's both... works like a charm. -- [##___l'urgent est remis a demain, l'impossible est en cours...___##] -- October Webinars: Code for Performance Free Intel webinars can help you accelerate appl

Re: [Synfig-devl] Git situation...how to solve?

2013-10-17 Thread Konstantin Dmitriev
2013/10/17 : > Hello, > > 'playing' with various branch around single_window ... i think i have done a > silly things, and before > going further i need some help. > > I want to get a clean branch of master ... how to "reset" the commit above > remote/upstream/master i have ? > > Illustration of m

Re: [Synfig-devl] Git situation...how to solve?

2013-10-17 Thread Carlos López González
Hi! if you don't want to loose your local master just create a new branch at master and keep it. Then right click the commit that says "Merge pull request #82..." and select "Reset master to this commit". Then it would ask for a soft, middle or hard reset. Choose hard. Good luck! 2013/10/17 >

[Synfig-devl] Git situation...how to solve?

2013-10-17 Thread d . j . a . y
Hello, 'playing' with various branch around single_window ... i think i have done a silly things, and before going further i need some help. I want to get a clean branch of master ... how to "reset" the commit above remote/upstream/master i have ? Illustration of my problem : http://pix.