"Lars Hjemli" <hjemli@xxxxxxxxx> writes: > On 11/28/07, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: >> On Wed, 28 Nov 2007, Steven Grimm wrote: >> > 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. > > Maybe branch.<name>.pullOptions ? Maybe not make this part of git-pull at all? merge and rebase have totally different impact on the resulting history, so perhaps a separate command that is a shorthand for "git fetch && git rebase" may help unconfuse the users. - 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
