Permalink
Browse files

Alias for continuing from a rebase, matching as push default

  • Loading branch information...
1 parent c381d3a commit 935de63afbb53881e96091ff0462501daddddc88 @matthewmccullough committed Dec 1, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 gitconfig
View
3 gitconfig
@@ -175,6 +175,7 @@
pushsvn = svn dcommit
pullsvn = svn rebase
nfjsunpushed = log origin/master..master --oneline
+ rtheirs = !git checkout --theirs ./ && git add . && git rebase --continue
[apply]
@@ -245,3 +246,5 @@
#[credential]
# helper = cache --timeout=300
+[push]
+ default = matching

0 comments on commit 935de63

Please sign in to comment.