From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 24 Nov 2014 19:33:07 +0000 (+0000)
Subject: git: default to upstream when merging
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/64cc705a45ab5e99f5500cfffbeaec2c451db14a?hp=64cc705a45ab5e99f5500cfffbeaec2c451db14a

git: default to upstream when merging
---