Hi, On Wed, 28 Nov 2007, Steven Grimm wrote: > On Nov 28, 2007, at 5:11 AM, Johannes Schindelin wrote: > > As a convenience, you can set the default behavior for a branch by > > defining the config variable branch.<name>.rebase, which is > > interpreted as a bool. This setting can be overridden on the command > > line by --rebase and --no-rebase. > > I wonder if this shouldn't be branch.<name>.pulltype or something like > that, so we can represent more than just "rebase or not." Values could > be "rebase", "merge" (the default) and maybe even "manual" to specify > that git-pull should neither merge nor rebase a particular branch even > if it matches a wildcard refspec. I am not convinced that this is a good thing... We already have branch.<name>.mergeOptions for proper merges, and I want to make clear that this is about rebase, and not about merge. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
