finally ready to announce that my git zine, “How Git Works", is coming out in ONE WEEK! on May 31!
it also comes with this (free!) cheat sheet which you can download and print out here: https://wizardzines.com/git-cheat-sheet.pdf
Follow
@b0rk Out of curiosity, why does the "do a fastforward merge" tip not use `--ff-only`? (I would expect it to, because that makes the situation less confusing if an ff merge is impossible. But maybe brevity won out?)
BTW. I really like that you mention `--force-with-lease` over `--force` (especially that I keep forgetting the name of the flag for the former).
@b0rk You might need to back the merge out though, if the merge was not an ff, but was trivial enough not to require your assistance.
@robryk it’s because I never use ff-only, i figure if i ever end up in a situation where it starts merging and I don’t want that i can always abort the merge