Sigh. You're right, what a silly man I am!!! I assume there's no way to do what I want, except maybe encourage everyone to use an alias for `git merge` that includes the flag. Thanks, D. On Mar 7, 3:10 pm, Andreas Schwab <sch...@xxxxxxxxxxxxxx> wrote: > Dun Peal <dunpea...@xxxxxxxxx> writes: > > There's a configuration feaute `branch.<name>.rebase` for specifying > > that all merges into a branch (master in this case) would be done by > > rebase > > That's not what it means. It means that a "git pull" is implicitly "git > pull --rebase". But if you do an explict merge it will not look at that > config setting. > > Andreas. > > -- > Andreas Schwab, sch...@xxxxxxxxxxxxxx > GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 > "And now for something completely different." > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majord...@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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