Guest User

Untitled

a guest
Apr 23rd, 2018
62
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.62 KB | None | 0 0
  1. ## adding
  2.  
  3. git merge -s ours --no-commit #{local_branch}
  4. git read-tree --prefix=#{mirror}/ -u #{local_branch}
  5. git add .braids
  6. git commit -m "Merge #{local_branch} into #{mirror}/" --no-verify
  7.  
  8. ## updating
  9.  
  10. when "svn"
  11. update_remote = <<-CMDS
  12. git svn fetch #{params["local_branch"]}
  13. git merge -s subtree #{params["local_branch"]}
  14. CMDS
  15. when "git"
  16. update_remote = <<-CMDS
  17. git fetch #{params["local_branch"]}
  18. git merge -s subtree #{params["local_branch"]}
  19. CMDS
Add Comment
Please, Sign In to add comment