Created
September 3, 2008 02:24
-
-
Save indirect/8522 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh -x | |
CURRENT=`git branch | grep "\*" | cut -d' ' -f2` | |
git checkout master | |
git svn info >/dev/null 2>/dev/null | |
if [[ $? == 0 ]]; then | |
git svn rebase | |
else | |
git pull origin master | |
fi | |
git checkout ${CURRENT} | |
git rebase master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env ruby | |
dir = ARGV[0] || "/usr/local/bin/" | |
["hack", "ship"].each do |n| | |
command = "sudo ln -s #{n}.sh #{dir}#{n}" | |
puts command | |
system(command) | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh -x | |
CURRENT=`git branch | grep "\*" | cut -d' ' -f2` | |
git checkout master | |
git svn info >/dev/null 2>/dev/null | |
if [[ $? == 0 ]]; then | |
git rebase ${CURRENT} | |
git svn dcommit | |
else | |
git merge ${CURRENT} | |
git push ${1:-origin} master | |
fi | |
git checkout ${CURRENT} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment