Permalink
Browse files

remove the rebase flag for now

  • Loading branch information...
1 parent b14d6f5 commit 280ebad901994fcd548b449d63ff767e00e9d1fe @termie termie committed May 31, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 git-bzr
View
@@ -542,7 +542,8 @@ def cmd_pull(args):
cmd_sync(args)
cl = Changelist()
bzr_ref = get_cfg('%s.bzr' % cl.branch())
- git(['pull', '--rebase', '.', '--', bzr_ref])
+ #git(['pull', '--rebase', '.', '--', bzr_ref])
+ git(['pull', '.', '--', bzr_ref])
def cmd_import(args):

0 comments on commit 280ebad

Please sign in to comment.