3 ms·

Oh wow, this must be a recent feature, I remember looking for a way to configure `--ff-only` by default a few years ago and it didn't seem possible. I ended up

Oh wow, this must be a recent feature, I remember looking for a way to configure `--ff-only` by default a few years ago and it didn't seem possible. I ended up making a git alias of `git puff` which calls pull with the `--ff-only` flag.

gsylvie 10y ago
Looks like it showed up with commit b814da891e, and has been around since Git v2.0.0. The online docs mention it in Git v2.1.0: https://git-scm.com/docs/git-config/2.1.0 https://git-scm.com/docs/git-config/2.1.0