From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 29 Apr 2014 13:48:38 +0000 (+0200)
Subject: gitconfig: enable merge.defaultToUpstream
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=91be5d6a9ab86f14eed55a4fc0f6b8928900c21c;hp=91be5d6a9ab86f14eed55a4fc0f6b8928900c21c;p=config%2Fdotfiles.git

gitconfig: enable merge.defaultToUpstream
---