Yes, and there is a documentation about this rule. https://phab.enlightenment.org/w/git_practices/#merging-change-back-into
Thanks. Daniel Juyung Seo (SeoZ) On Fri, Aug 22, 2014 at 12:09 AM, Tom Hacohen <[email protected]> wrote: > Hey, > > You'e made a lot of mess. > > First of all, we don't merge like this, only merge with --no-ff after > rebasing. This is really bad!!! > > Second of all, we have good commit messages in the merge commits, not > this. Please read the guidelines again. > > Super spank. > > -- > Tom. > > On 21/08/14 15:57, Wonguk Jeong wrote: > > huchi pushed a commit to branch master. > > > > > http://git.enlightenment.org/core/efl.git/commit/?id=1142864d6f29fa3d6115dedf66b33a42d3ee7464 > > > > commit 1142864d6f29fa3d6115dedf66b33a42d3ee7464 > > Merge: d1dce7c bbe563b > > Author: Wonguk Jeong <[email protected]> > > Date: Thu Aug 21 16:57:05 2014 +0200 > > > > Merge branch 'master' of ssh://git.enlightenment.org/core/efl > > > > src/modules/evas/engines/gl_drm/evas_drm.c | 16 ++--- > > src/modules/evas/engines/gl_drm/evas_drm_main.c | 11 +--- > > src/modules/evas/engines/gl_drm/evas_engine.c | 85 > +++++++++---------------- > > 3 files changed, 39 insertions(+), 73 deletions(-) > > > > > > > ------------------------------------------------------------------------------ > Slashdot TV. > Video for Nerds. Stuff that matters. > http://tv.slashdot.org/ > _______________________________________________ > enlightenment-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
