Someone just asked me to recommend a good #git #book; I finally conceded that `do a #websearch for "git config.ff only"' is probably best—because any teacher who doesn't tell you to do that as part of your most basic git setup is probably someone you shouldn't listen to.