You could also use: $ git merge --squash yaml_branch
A little easier than piping a diff. Brian. On Mon, Aug 3, 2009 at 16:01, Eloy Duran<eloy.de.en...@gmail.com> wrote: > Btw: About git-svn creating many commits, I wouldn't worry about it :) But > if you'd like to normalize, I'd do something like: > $ git checkout -b yaml_branch > # work on it > $ git checkout master > $ git diff yaml_branch | patch -p1 > $ git add . > $ git commit -v > Eloy > > On 3 aug 2009, at 19:51, Patrick Thomson wrote: > > Hi everyone, > > I've just pushed my work on a new YAML module to the experimental branch > (revision 2184). Rather than being backed by the old syck code that 1.8/1.9 > use, this is backed by the libYAML library (BSD licensed). As of right now > it appears to be about 4x slower than 1.9's YAML module, but there's a lot > of room for optimizing my code. > > This new YAML module aims to be wholly compatible with the old API inside > yaml.rb. Please test this module out, and let me know if you find any > inconsistencies or false results. As of right now it passes the RubySpecs > for YAML::dump() and YAML::load(). > > (Oh, and sorry for spamming the macruby-changes list; git-svn applied > something like 40 commits at one time. Oops!) > > -- Patrick Thomson > _______________________________________________ > MacRuby-devel mailing list > MacRuby-devel@lists.macosforge.org > http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel > > > _______________________________________________ > MacRuby-devel mailing list > MacRuby-devel@lists.macosforge.org > http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel > > _______________________________________________ MacRuby-devel mailing list MacRuby-devel@lists.macosforge.org http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel
