lib/socialcast-git-extensions/git.rb in socialcast-git-extensions-3.1.31 vs lib/socialcast-git-extensions/git.rb in socialcast-git-extensions-3.1.32

- old
+ new

@@ -102,10 +102,10 @@ run_cmd "git push origin #{branch}" track_branch branch end def track_branch(branch) - run_cmd "git branch --track origin/#{branch}" + run_cmd "git branch --set-upstream-to=origin/#{branch} #{branch}" end # integrate a branch into a destination aggregate branch # blow away the local aggregate branch to ensure pulling into most recent "clean" branch def integrate_branch(branch, destination_branch)