Hello. On 04/17/2013 10:11 AM, Daniel Willmann wrote: > On 04/17/13 09:28, Stefan Schmidt wrote: >> Hello. >> >> On 04/17/2013 09:22 AM, Shinwoo Kim - Enlightenment Git wrote: >>> kimcinoo pushed a commit to branch master. >>> >>> commit 94a01eda9300d5fa39b6fe0f03a818ad3d999d43 >>> Merge: f4d0934 6c433df >>> Author: Shinwoo Kim <cinoo....@samsung.com> >>> Date: Wed Apr 17 16:40:55 2013 +0900 >>> >>> Merge branch 'master' of >> ssh://git.enlightenment.org/core/elementary >>> > [...] >>> 25 files changed, 415 insertions(+), 270 deletions(-) >> >> This does look broken to me. What did you do? > > That's just the changes that happened in master since the start of the > branch. > > If you look at the history there is one commit which got merged (in > elm_index.c). All the other changes are from the commits that happened > in master in the meanwhile.
OK, so we got away with a black eye here :) Shniwoo, please rebase your local changes instead of merging them. It was written to the list several times before but here as an reference: git pull --rebase And if you want to set it in your config: git config branch.master.rebase true Or for all git repos: git config --global branch.master.rebase true regards Stefan Schmidt ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
