Elijah Newren via GitGitGadget wrote: > We've recently discussed how to handle conflicting configuration and command > line options in git pull, including at least a few different > proposals[1][2][3] to handle different subsets of the possibilities. We also > have a user report from someone who had conflicting configuration and got > surprised when one of the options overruled the other -- with no warning > from the command or the documentation that such would happen. No, that's not what happened, you are assuming wrongly. It's perfectly fine to have pull.ff and pull.rebase, because the former will be honored when running `git pull --merge`, as I already explained [1]. [1] http://lore.kernel.org/git/60ef1f6a83b61_9460a208cc@natae.notmuch -- Felipe Contreras
