Permalink
Browse files

Experimental branch restart

  • Loading branch information...
1 parent c02c5da commit 1a69544372c9d74b8a5f2886a9ddd76b33e98abd @jeanfrancisroy jeanfrancisroy committed Apr 1, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 funtoo/scripts/experimental-update.sh
@@ -3,5 +3,4 @@ eval `keychain --noask --eval id_dsa` || exit 1
cd /root/git/funtoo-overlay
# get latest merge.py and friends
git pull || exit 1
-#/root/git/funtoo-overlay/funtoo/scripts/merge.py --branch experimental /var/git/experimental-mini-2011 || exit 1
-/root/git/funtoo-overlay/funtoo/scripts/merge.py --branch master /var/git/experimental-mini-2011 || exit 1
+/root/git/funtoo-overlay/funtoo/scripts/merge.py --branch experimental /var/git/experimental-mini-2011 || exit 1

0 comments on commit 1a69544

Please sign in to comment.