Stephen Haberman <step...@exigencecorp.com> writes: > Hi Johannes, > >> This should probably be added to config.txt and >> Documentation/git-pull.txt, too, right? > > Yep, I meant to note that I'd do that after getting an initial > confirmation that the pull.preserve-merges was the preferred approach.
If you were to go that route, no dashes in the last component of configuration variable names, please. > (I was being lazy and didn't want to write up docs only to switch to > overloading pull.rebase or what not.) I think we have a recent update that allows you to say [pull] rebase = false to mean "I want 'git pull' to use merge". Currently the other choice is: [pull] rebase = true to say "I want to run 'git pull --rebase'". I do not think it is unreasonable to extend it further so that [pull] rebase = preserve is understood. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html