Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
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 wonguk.je...@samsung.com 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 enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
I'm really sorry about it. :s I just forgot to rebase..., I just did pull and push (auto merged). It will not gonna happen again. Thank you for Super Spank. On Thu, Aug 21, 2014 at 5:09 PM, Tom Hacohen tom.haco...@samsung.com 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 wonguk.je...@samsung.com 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 enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
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 tom.haco...@samsung.com 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 wonguk.je...@samsung.com 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 enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
Just always git pull --rebase (there's even a git option to set this as the default). -- Tom. On 21/08/14 16:23, Won guk Jeong wrote: I'm really sorry about it. :s I just forgot to rebase..., I just did pull and push (auto merged). It will not gonna happen again. Thank you for Super Spank. On Thu, Aug 21, 2014 at 5:09 PM, Tom Hacohen tom.haco...@samsung.com 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 wonguk.je...@samsung.com 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 enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
On Sun, 24 Feb 2013 00:56:24 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: Ok so, I consider we use rebase not merge. Thanks. Yeah, the consensus seemed to be rebase not merge. In any case I enabled commit graphs so you can actually see the correct history with merges in the log: http://git.enlightenment.org/core/efl.git/log/ Regards, Daniel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
On Mon, Feb 25, 2013 at 8:46 AM, Daniel Willmann dan...@totalueberwachung.de wrote: On Sun, 24 Feb 2013 00:56:24 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: Ok so, I consider we use rebase not merge. Thanks. Yeah, the consensus seemed to be rebase not merge. Yes that's what I guessed. In any case I enabled commit graphs so you can actually see the correct history with merges in the log: That's great :) Btw, I use qgit as my local git tools. I prefer qgit to gitk. But I want to have eGit written by EFL. Daniel Juyung Seo (SeoZ) http://git.enlightenment.org/core/efl.git/log/ Regards, Daniel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
Hello, this must be the first merge branch commit. So what's our policy? merge or rebase? I think we didn't clear this up. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git no-re...@enlightenment.org wrote: hermet pushed a commit to branch master. commit 029d539a85306019608e27a611ace500b313dd71 Merge: 9c950e4 161a784 Author: ChunEon Park chuneon.p...@samsung.com Date: Sat Feb 23 19:52:57 2013 +0900 Merge branch 'master' of ssh://git.enlightenment.org/core/efl src/examples/ecore/ecore_imf_example.c | 44 +++--- 1 file changed, 36 insertions(+), 8 deletions(-) -- -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
Before make commit, git pull should be done to prevent this useless commit. If conflict occurred, git stash git pull git stash pop is good solution. Otherwise, solve the conflict manually to make commit on top of the origin/master's HEAD. 2013/2/23 Daniel Juyung Seo seojuyu...@gmail.com: Hello, this must be the first merge branch commit. So what's our policy? merge or rebase? I think we didn't clear this up. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git no-re...@enlightenment.org wrote: hermet pushed a commit to branch master. commit 029d539a85306019608e27a611ace500b313dd71 Merge: 9c950e4 161a784 Author: ChunEon Park chuneon.p...@samsung.com Date: Sat Feb 23 19:52:57 2013 +0900 Merge branch 'master' of ssh://git.enlightenment.org/core/efl src/examples/ecore/ecore_imf_example.c | 44 +++--- 1 file changed, 36 insertions(+), 8 deletions(-) -- -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- BRs, Kim. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
Yes 'git pull --rebase' also helps but we should decide the policy first. There was a discussion about this but as far as I know we didn't make a conclusion that can be announced. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 11:46 PM, Bluezery ohpo...@gmail.com wrote: Before make commit, git pull should be done to prevent this useless commit. If conflict occurred, git stash git pull git stash pop is good solution. Otherwise, solve the conflict manually to make commit on top of the origin/master's HEAD. 2013/2/23 Daniel Juyung Seo seojuyu...@gmail.com: Hello, this must be the first merge branch commit. So what's our policy? merge or rebase? I think we didn't clear this up. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git no-re...@enlightenment.org wrote: hermet pushed a commit to branch master. commit 029d539a85306019608e27a611ace500b313dd71 Merge: 9c950e4 161a784 Author: ChunEon Park chuneon.p...@samsung.com Date: Sat Feb 23 19:52:57 2013 +0900 Merge branch 'master' of ssh://git.enlightenment.org/core/efl src/examples/ecore/ecore_imf_example.c | 44 +++--- 1 file changed, 36 insertions(+), 8 deletions(-) -- -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- BRs, Kim. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
We said rebase for the time being, to work more like SVN, if we'd like to change that at some point in the future, we will. On Sat, Feb 23, 2013 at 2:52 PM, Daniel Juyung Seo seojuyu...@gmail.comwrote: Yes 'git pull --rebase' also helps but we should decide the policy first. There was a discussion about this but as far as I know we didn't make a conclusion that can be announced. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 11:46 PM, Bluezery ohpo...@gmail.com wrote: Before make commit, git pull should be done to prevent this useless commit. If conflict occurred, git stash git pull git stash pop is good solution. Otherwise, solve the conflict manually to make commit on top of the origin/master's HEAD. 2013/2/23 Daniel Juyung Seo seojuyu...@gmail.com: Hello, this must be the first merge branch commit. So what's our policy? merge or rebase? I think we didn't clear this up. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git no-re...@enlightenment.org wrote: hermet pushed a commit to branch master. commit 029d539a85306019608e27a611ace500b313dd71 Merge: 9c950e4 161a784 Author: ChunEon Park chuneon.p...@samsung.com Date: Sat Feb 23 19:52:57 2013 +0900 Merge branch 'master' of ssh://git.enlightenment.org/core/efl src/examples/ecore/ecore_imf_example.c | 44 +++--- 1 file changed, 36 insertions(+), 8 deletions(-) -- -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- BRs, Kim. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Tom. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 02/02: Merge branch 'master' of ssh://git.enlightenment.org/core/efl
Ok so, I consider we use rebase not merge. Thanks. Daniel Juyung Seo (SeoZ) On Sun, Feb 24, 2013 at 12:15 AM, Tom Hacohen t...@stosb.com wrote: We said rebase for the time being, to work more like SVN, if we'd like to change that at some point in the future, we will. On Sat, Feb 23, 2013 at 2:52 PM, Daniel Juyung Seo seojuyu...@gmail.comwrote: Yes 'git pull --rebase' also helps but we should decide the policy first. There was a discussion about this but as far as I know we didn't make a conclusion that can be announced. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 11:46 PM, Bluezery ohpo...@gmail.com wrote: Before make commit, git pull should be done to prevent this useless commit. If conflict occurred, git stash git pull git stash pop is good solution. Otherwise, solve the conflict manually to make commit on top of the origin/master's HEAD. 2013/2/23 Daniel Juyung Seo seojuyu...@gmail.com: Hello, this must be the first merge branch commit. So what's our policy? merge or rebase? I think we didn't clear this up. Daniel Juyung Seo (SeoZ) On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git no-re...@enlightenment.org wrote: hermet pushed a commit to branch master. commit 029d539a85306019608e27a611ace500b313dd71 Merge: 9c950e4 161a784 Author: ChunEon Park chuneon.p...@samsung.com Date: Sat Feb 23 19:52:57 2013 +0900 Merge branch 'master' of ssh://git.enlightenment.org/core/efl src/examples/ecore/ecore_imf_example.c | 44 +++--- 1 file changed, 36 insertions(+), 8 deletions(-) -- -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- BRs, Kim. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Tom. -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
