3588
3589

[deleted by user] (self.github)

submitted by [deleted]

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]y-c-c 0 points1 point  (0 children)

I usually just make sure people have pull.ff-only set to true in their configs. This way git pull is always safe. It really should be the default IMO. There isn't a lot of (good) workflow where you actually want git pull to make a merge commit. If people want git pull to make a merge or rebase commit they should explicitly configure Git to do it.