[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 :

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

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

2013-10-17 Thread Konstantin Dmitriev
2013/10/17 d.j@free.fr: 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

Re: [Synfig-devl] gtk3 branch and gdk_gc branch

2013-10-17 Thread Ivan Mahonin
Hi, Carlos Thank you. I've included it in my brunch and continue conversion. Hi Ivan, I've been porting the remaining Gdk::GC drawing operations to use Cairo instead. https://github.com/genete/synfig/tree/gdk_gc I've just seen that you're working on port gtk to the 3.0 version what

Re: [Synfig-devl] gtk3 branch and gdk_gc branch

2013-10-17 Thread Carlos López González
Does it mean that you're going to take care of the remaining Gdk::GC to Cairo? I don't mind to continue that task in parallel with you. There are just a couple of GC remaining. Meanwhile you can take care of the rest of deprecated API in gtk/gtkmm 2.24, which is the first stop we should do before

Re: [Synfig-devl] gtk3 branch and gdk_gc branch

2013-10-17 Thread Carlos López González
Ah, forgot to mention that my Gdk branch grown yesterday one more commit. https://github.com/genete/synfig/commits/gdk_gc Please pickup that commit. El viernes, 18 de octubre de 2013, Carlos López González escribió: Does it mean that you're going to take care of the remaining Gdk::GC to Cairo?

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