Re: [Bf-committers] How Merge master changes into remote branch

Le 21/11/2013 13:08, Wander Lairson Costa a écrit : 2013/11/20 Joshua Leung aligor...@gmail.com: 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),

[Bf-committers] Git commit issues

Hi all, It seems we are all still learning how to work with Git, and it's being complicated more by problems with git submodules that seem to not be behaving like we want them to. When pushing changes, please carefully read the instructions here:

Re: [Bf-committers] How Merge master changes into remote branch

2013/11/20 Brecht Van Lommel brechtvanlom...@pandora.be: 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

[Bf-committers] Git video

Watch. Learn. Enjoy! ;) ~1h 22m: https://www.youtube.com/watch?v=ZDR433b0HJY Dan ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers

[Bf-committers] Infinite Focal Distance

Allows for infinite focal distance/pixel aspect. Idea taken from the quick fix page. Index: source/blender/makesrna/intern/rna_camera.c === --- source/blender/makesrna/intern/rna_camera.c (revision 61240) +++

Re: [Bf-committers] Git commit issues

2013/11/21 Brecht Van Lommel brechtvanlom...@pandora.be: Hi all, It seems we are all still learning how to work with Git, and it's being complicated more by problems with git submodules that seem to not be behaving like we want them to. When pushing changes, please carefully read the