Dun Peal <dunpealer@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, schwab@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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html