summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-01-27 17:41:23 +0100
committerChristoph Helma <helma@in-silico.ch>2011-01-27 17:41:23 +0100
commit98f71b5587f0dfb9b5293947b7e78fde5a3e642d (patch)
treeadc1948eba5cc84ec2493bcb49fd62213c00535e /Rakefile
parent0468af7ef5a0bc00c0fb83bd71e0d6287671d465 (diff)
master branch for las-utils
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Rakefile b/Rakefile
index d52f60d..e60ffc7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,10 +30,10 @@ namespace "fminer" do
end
puts `make ruby`
Dir.chdir('../../last-utils')
- puts `git fetch`
+ #puts `git fetch`
# AM LAST: need branch 'experimental' until merged to master in last-utils
- puts `git checkout -f -b experimental origin/experimental`
- puts `git checkout experimental`
+ #puts `git checkout -f -b experimental origin/experimental`
+ puts `git checkout master`
puts `git pull`
end
@@ -63,10 +63,10 @@ namespace "fminer" do
end
puts `make ruby`
Dir.chdir('../../last-utils')
- puts `git fetch`
+ #puts `git fetch`
# AM LAST: need branch 'experimental' until merged to master in last-utils
- puts `git checkout -f -b experimental origin/experimental`
- puts `git checkout experimental`
+ #puts `git checkout -f -b experimental origin/experimental`
+ puts `git checkout master`
puts `git pull`
end
end