diff options
Diffstat (limited to 'lib/jitterbug')
| -rw-r--r-- | lib/jitterbug/Builder.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/jitterbug/Builder.pm b/lib/jitterbug/Builder.pm index 9abef14..150eae7 100644 --- a/lib/jitterbug/Builder.pm +++ b/lib/jitterbug/Builder.pm @@ -120,7 +120,9 @@ sub run_task { debug("Cleaning git repo"); system("git clean -dfx"); debug("Fetching new commits into $repo"); - system("git pull --rebase"); + system("git fetch"); + debug("Rebasing onto origin/master"); + system("git rebase origin/master"); chdir $pwd; $r = Git::Repository->new( work_tree => $build_dir ); } else { |