28.07.2013 22:03, Bart Oldeman пишет: > On 10 July 2013 12:27, Stas Sergeev wrote: >> But, out of sudden, "devel" happened to have so many >> big or untrivial changes, that no one seems to be willing >> to spend the time on sorting them out and merge to master. >> I think I'll just end up merging it to master as-is eventually, >> but Bart promised to take a look at a few things, so it is >> all upside down for now. > As you could see I finally started merging pieces of devel back to > master, mostly using "git cherry-pick". Hmm, you seem to have somehow messed up the history. Now the devel branch have a lot of old commits on top. - They are duplicated in the log - It looks like the last commit was jul 1, and to see the more recent commits the one have to scroll down a lot. Would it be possible to get back to the "flat" history?
------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Dosemu-devel mailing list Dosemu-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dosemu-devel
