Ah great tip with --squash Dalai. Thanks! I was just learning about rebase -i, which is also very useful.
Jonathan Williamson http://cgcookie.com On Fri, Jan 3, 2014 at 4:22 PM, Dalai Felinto <[email protected]> wrote: > You can do git merge --squash next time, that will make one commit out > of all the individual ones. > > Or git rebase -i HEAD~3 (or 10, ...) to group commits together) > > It's really a matter of deciding how relevant the individual logs are > for our git history. > -- > blendernetwork.org/dalai-felinto > www.dalaifelinto.com > > > 2014/1/3 Jonathan Williamson <[email protected]>: > > Sorry about the commit overload just now. Will apply patches directly to > > master instead of merging in the branch next time :) > > > > Jonathan Williamson > > http://cgcookie.com > > _______________________________________________ > > Bf-committers mailing list > > [email protected] > > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
