On Mon, 11 Mar 2013 10:16:11 +0000 Daniel Willmann <[email protected]> said:
> On 11/03/13 08:07, Carsten Haitzler (The Rasterman) wrote: > > On Mon, 11 Mar 2013 16:09:30 +0900 Cedric BAIL <[email protected]> said: > > > >> On Mon, Mar 11, 2013 at 3:56 PM, Carsten Haitzler - Enlightenment Git > >> <[email protected]> wrote: > >>> raster pushed a commit to branch master. > >>> > >>> commit 3f00d9ee606b2a812cf0cf6592b98e1079d53298 > >>> Merge: b389f6d a91814f > >>> Author: Carsten Haitzler (Rasterman) <[email protected]> > >>> Date: Mon Mar 11 15:57:16 2013 +0900 > >>> > >>> Merge branch 'master' of ssh://git.enlightenment.org/core/efl > >> > >> What is that commit doing ??? > > > > wtf? i have NO idea what that is doing.. there were no changes i made > > there at > > all... i .. don't.. get.. it... i had a change i didnt commit and i git > > reset > > that file... but i have no idea what this is... > > No changes? You pushed two commits - 'emotion "fix"' and 'make evas > smart callbnacks safer'. It seems you pushed these roughly three hours ago. > Before you pushed the commits you probably issued a "git pull". As you > were missing four commits at that point (two cedric pushed and two from > mike) git did what you told it to do and pulled these commits in with > its default strategy of merge. Had you run "git pull --rebase" your > commits would have been rebased and this problem avoided. i did git pull --rebase... thats like the only pull type i do. :) > You can also issue "git config --global branch.master.rebase true" to > avoid this in the future (git will do a rebase by default). > > > /me looks sideways at git and shuffles away a few seats for safety > > No need. You two should talk and get to know each other. :-) > > > Regards, > Daniel > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) [email protected] ------------------------------------------------------------------------------ Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the endpoint security space. For insight on selecting the right partner to tackle endpoint security challenges, access the full report. http://p.sf.net/sfu/symantec-dev2dev _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
