From: Vic L. <ll...@16...> - 2010-07-13 15:57:35
|
I reverted the commit on maint. However now if I try to merge maint into master again, it reverts master as well. How to let git "forget" the commit and not to revert master when next time I merge maint? On Tue, 2010-07-13 at 23:06 +0800, Vic Lee wrote: > Hi, > > It's just an API cleanup by changing some labels, but of course it's not > a problem for me to leave it in master only. > > Vic > > On Tue, 2010-07-13 at 11:43 -0300, Otavio Salvador wrote: > > Hello, > > > > On Tue, Jul 13, 2010 at 11:03 AM, Mads Kiilerich <ma...@ki...> wrote: > > > The change is fine, but I don't understand why it was put on maint. > > > > Agreed; this is not suitable to maint. > > > > > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Sprint > What will you do first with EVO, the first 4G phone? > Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first > _______________________________________________ > Freerdp-devel mailing list > Fre...@li... > https://lists.sourceforge.net/lists/listinfo/freerdp-devel |