]> git.rmz.io Git - dotfiles.git/commitdiff
repos / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44164ac)
git: default to upstream when merging
authorSamir Benmendil <samir.benmendil@gmail.com>
Mon, 24 Nov 2014 19:33:07 +0000 (19:33 +0000)
committerSamir Benmendil <samir.benmendil@gmail.com>
Mon, 24 Nov 2014 19:33:07 +0000 (19:33 +0000)
git/config patch | blob | history

diff --git a/git/config b/git/config
index 06d260385da33f82bbb25e598e073ccf6dae774d..911ad2cb09b8360af159ec06d02c041714ab9f17 100644 (file)
--- a/git/config
+++ b/git/config
@@ -23,5 +23,6 @@
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
        tool = fugitive
+       defaultToUpstream = true
 [mergetool]
        prompt = no
My dotfiles