Permalink
Browse files

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

  • Loading branch information...
1 parent 0f5f5c4 commit 1f5cbfb711a3ec469b96f1783b31e991ce6a3320 @csand committed Jan 14, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 gitconfig
View
@@ -16,6 +16,7 @@
submod = submodule
sub = submodule
remotes = remote -v
+ pull-upstream = pull --no-commit --startegy=recursive -X ours
[core]
editor = vim

0 comments on commit 1f5cbfb

Please sign in to comment.