]> git.rmz.io Git - dotfiles.git/commit
git: interactive rebase when pulling, except master/develop
authorSamir Benmendil <samir.benmendil@ultrahaptics.com>
Mon, 15 May 2017 09:56:44 +0000 (10:56 +0100)
committerSamir Benmendil <samir.benmendil@ultrahaptics.com>
Mon, 15 May 2017 09:56:44 +0000 (10:56 +0100)
commit66c6b2daeecf9af749a565faad35ad54f87e0154
tree39efed86785e39b9ce7a2f3ae56ab7f4679abfbe
parent96249d4bf3fe549e8964690ec22028a95742202e
git: interactive rebase when pulling, except master/develop

master and develop branches should try to preserve merges when rebasing.

Now this is not ideal because the branch names are hard-coded, if I
contribute to a project that names their main branch `dev` it will
default to `interactive` :/
git/config