From: Jay Soffian Date: Sat, 16 Feb 2008 04:10:03 GMT Subject: Git rebase/pull questions Message-ID: <76718490802152010udd11567v25ae456db0a59f3b@mail.gmail.com> First, I notice that git-rebase supports a --s/--strategy option (which implies -m/--merge). I wonder whether it should respect branch..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.