First, I notice that git-rebase supports a --s/--strategy option (which implies -m/--merge). I wonder whether it should respect branch.<name>.mergeoptions as the default for this setting? (BTW, git-rebase's USAGE/LONG_USAGE doesn't match its man page. Also, the man page synopsis doesn't include all the options the man page documents later on.) Second, git-pull completely ignores -s/--strategy if also give --rebase, but I wonder if it shouldn't just pass the strategy along to git-rebase. Thoughts? j. - 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
