Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ## adding
- git merge -s ours --no-commit #{local_branch}
- git read-tree --prefix=#{mirror}/ -u #{local_branch}
- git add .braids
- git commit -m "Merge #{local_branch} into #{mirror}/" --no-verify
- ## updating
- when "svn"
- update_remote = <<-CMDS
- git svn fetch #{params["local_branch"]}
- git merge -s subtree #{params["local_branch"]}
- CMDS
- when "git"
- update_remote = <<-CMDS
- git fetch #{params["local_branch"]}
- git merge -s subtree #{params["local_branch"]}
- CMDS
Add Comment
Please, Sign In to add comment