re: coding style
i also prefer spaces over tabs (haven’t been doing it though), but prefer 4 spaces instead of 2… and actually i agree on omitting curly braces! but i think if the whole statement is one line that can be an exception.
regardless of personal preferences my general rule when working with somebody else’s code is to adapt their style anyway (including naming conventions), so i’m good with whatever we agree on. this will only apply to shared code anyway, so makes sense to keep it consistent.
re: git
i don’t have strong preferences here, and i don’t have much experience with git, but based on my day job i do prefer doing code reviews on smaller check-ins, and i find it provides for better discussion then one massive change… but other than that i am good with whatever you guys decide!