On Wed, Nov 20, 2013 at 2:28 AM, Daniel Tavares
danielmtava...@gmail.com wrote:
git merge master
This answer is indeed nearly all you need to do, but let me expand on
it a bit. When you do git clone you are in fact getting all branches
(that's intentional). So with this clone you have you can
Hi,
I've added Manu Järvinen to the list, he's the proposed creative lead for the
Finnish unit, studio Lumukuu.
Check his site:
http://www.manujarvinen.com/
-Ton-
Ton Roosendaal - t...@blender.org - www.blender.org
Chairman
Hi,
Haha, I have too many mailing lists :)
Ignore it!
-Ton-
Ton Roosendaal - t...@blender.org - www.blender.org
Chairman Blender Foundation - Producer Blender Institute
Entrepotdok 57A - 1018AD Amsterdam - The Netherlands
On
At the moment what we are advising is to rebase for local only
branches, and merge for branches that are in the repository on
git.blender.org, and so shared with others. When that branch is going
to be merged into the master branch, it must be first locally rebased
and then pushed.
In fact this
2013/11/20 Brecht Van Lommel brechtvanlom...@pandora.be:
At the moment what we are advising is to rebase for local only
branches, and merge for branches that are in the repository on
git.blender.org, and so shared with others. When that branch is going
to be merged into the master branch, it
On Wed, Nov 20, 2013 at 3:53 PM, Wander Lairson Costa
wander.lair...@gmail.com wrote:
I didn't know you could configure this policy on git server. Is this a
phabricator feature?
The git server can do hooks/shell scripts that can act on stuff like the
revision and objects etc, and depending
We have set the denyNonFastForwards option to disable force push:
http://stackoverflow.com/questions/1754491/is-there-a-way-to-configure-git-repository-to-reject-git-push-force
For denying merge commits to the master branch, we use this update
hook (modified from the update.sample hook):
Le 20/11/2013 21:49, Brecht Van Lommel a écrit :
At the moment what we are advising is to rebase for local only
branches, and merge for branches that are in the repository on
git.blender.org, and so shared with others. When that branch is going
to be merged into the master branch, it must be
On Wed, Nov 20, 2013 at 11:55 AM, Linus Wiklander
linus.wiklan...@gmail.com wrote:
I can't say I miss the functionality, if it had never been there I would
have been fine with that. I think there are a lot of better stuff to focus
on than to try to bring this back.
What annoyed me was that
@Joshua:
I thank for your help.
I link to local lib until it is opened up and use it.
Thank you very much for your advice.
PerfectionCat
- Original Message -
From: Joshua Leung aligor...@gmail.com
To: PerfectionCat sindra1961reb...@yahoo.co.jp; bf-blender developers
Good points Julien/_FrnchFrgg_
I'm personally of the opinion that usage of rebase in general is a Bad
Thing (TM). For small/short-lived projects (or local feature branches for
small features), it's probably ok to use rebase (though again, that depends
heavily on the nature of how things
Hi, devs.
I have a question.
addons and addons_contrib included in the install folder become targeted for
management of Git after build.
It should have become outside a management object in the SVN environment.
Is this improved?
PerfectionCat
___
Excuse me.
I build in SCONS+msvc9.
PerfectionCat
- Original Message -
From: PerfectionCat sindra1961reb...@yahoo.co.jp
To: bf-committers@blender.org bf-committers@blender.org
Date: 2013/11/21, Thu 09:45
Subject: [Bf-committers] addons and addons_contrib
Hi, devs.
I have a question.
From the point of view of keeping it easy to do code reviews and to
keep Blender master stable, it's nice if what's coming in are easy to
understand incremental changes to the latest master. Sanitizing the
development history is work for developers but also a big help to the
code reviewers.
I
Some of you may have seen my 11 year old son Andrew present his Marble
Factory at Blender Conference 2013 in Amsterdam last month.
http://youtu.be/XA_715Fd7so?t=5m38s
What you may not know is that initially, the animation didn't work
properly because of a limitation in Blender where the motion
15 matches
Mail list logo
