"Tom Clarke" <tom@xxxxxxx> writes: > I'm happy to try to address the issues you raised, but I wonder if we > would do better to look back at my original proposal which was to add > a --rebase option to git-pull. git-pull is the main place there I see > need for using a rebase instead of a merge, as anywhere where you > might use git-merge directly, if what you really want is a rebase, you > can just run git-rebase. Yeah, we have taught "git-pull == git-fetch + git-merge" to our users, and "-s strategy" has been a way to specify _how_ the merge is done, and not about doing something that is not a merge. As you say, rebase is not doing a merge. But neither is "squash". "git-pull --rebase == git-fetch + git-rebase" might be simpler for end users to understand. I dunno. - 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
