git: Added alias for pulling from upstream while preferring own commits

csand · Jan 14, 2013 · 1f5cbfb · 1f5cbfb
1 parent 0f5f5c4
commit 1f5cbfb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gitconfig b/gitconfig
@@ -16,6 +16,7 @@
 	submod = submodule
 	sub = submodule
 	remotes = remote -v
+	pull-upstream = pull --no-commit --startegy=recursive -X ours
 
 [core]
 	editor = vim