Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

2016-11-16 Thread Tom Hacohen 
I was away, so the reply is a bit late, but: you should "git log" or 
better yet: "git log --graph" before you push to make sure it does what 
you intended.

Furthermore, always do "git pull --rebase", not "git pull". You can 
change this as a setting.

--
Tom.

On 02/11/16 11:50, Stephen Houston wrote:
> Bahhh. Thought I did rebase. My bad. Git and I are still working on our
> relationship.
>
> On Wed, Nov 2, 2016, 3:41 AM Stefan Schmidt  wrote:
>
>> Hello.
>>
>> On 01/11/16 20:21, Stephen okra Houston wrote:
>>> okra pushed a commit to branch master.
>>>
>>>
>> http://git.enlightenment.org/core/enlightenment.git/commit/?id=722ef6442630a5598bec8ec55bb3d309518f7440
>>>
>>> commit 722ef6442630a5598bec8ec55bb3d309518f7440
>>> Merge: 7304758 4d86c98
>>> Author: Stephen okra Houston 
>>> Date:   Tue Nov 1 13:28:33 2016 -0500
>>>
>>> Merge branch 'master' of git+ssh://
>> git.enlightenment.org/core/enlightenment
>>
>> Let me remind you that we do not do merges. The only exception is fast
>> forward merge commits for a bigger patch series. This merge commit needs
>> to have a good commit message describing the whole series though.
>>
>> To me this looks more as if you merge a branch you worked in into master
>> without rebasing. Please avoid this in the future.
>>
>> regards
>> Stefan Schmidt
>>
>>
>> --
>> Developer Access Program for Intel Xeon Phi Processors
>> Access to Intel Xeon Phi processor-based developer platforms.
>> With one year of Intel Parallel Studio XE.
>> Training and support from Colfax.
>> Order your platform today. http://sdm.link/xeonphi
>> ___
>> enlightenment-devel mailing list
>> enlightenment-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>>
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>


--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

2016-11-02 Thread Stephen Houston 
Bahhh. Thought I did rebase. My bad. Git and I are still working on our
relationship.

On Wed, Nov 2, 2016, 3:41 AM Stefan Schmidt  wrote:

> Hello.
>
> On 01/11/16 20:21, Stephen okra Houston wrote:
> > okra pushed a commit to branch master.
> >
> >
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=722ef6442630a5598bec8ec55bb3d309518f7440
> >
> > commit 722ef6442630a5598bec8ec55bb3d309518f7440
> > Merge: 7304758 4d86c98
> > Author: Stephen okra Houston 
> > Date:   Tue Nov 1 13:28:33 2016 -0500
> >
> > Merge branch 'master' of git+ssh://
> git.enlightenment.org/core/enlightenment
>
> Let me remind you that we do not do merges. The only exception is fast
> forward merge commits for a bigger patch series. This merge commit needs
> to have a good commit message describing the whole series though.
>
> To me this looks more as if you merge a branch you worked in into master
> without rebasing. Please avoid this in the future.
>
> regards
> Stefan Schmidt
>
>
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

2016-11-02 Thread Stefan Schmidt 
Hello.

On 01/11/16 20:21, Stephen okra Houston wrote:
> okra pushed a commit to branch master.
>
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=722ef6442630a5598bec8ec55bb3d309518f7440
>
> commit 722ef6442630a5598bec8ec55bb3d309518f7440
> Merge: 7304758 4d86c98
> Author: Stephen okra Houston 
> Date:   Tue Nov 1 13:28:33 2016 -0500
>
> Merge branch 'master' of 
> git+ssh://git.enlightenment.org/core/enlightenment

Let me remind you that we do not do merges. The only exception is fast 
forward merge commits for a bigger patch series. This merge commit needs 
to have a good commit message describing the whole series though.

To me this looks more as if you merge a branch you worked in into master 
without rebasing. Please avoid this in the future.

regards
Stefan Schmidt

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel