}
log '$' cd ../rebase-tmp
cd ../rebase-tmp
-execute git fetch --no-tags $cpwd refs/heads/akpm/master:akpm || {
- echo Fetch of akpm/master failed 1>&2
- bash -i || exit
-}
-execute git fetch --no-tags $cpwd refs/heads/akpm/master-base:akpm-base || {
- echo Fetch of akpm/master-base failed 1>&2
+execute git checkout -b akpm remotes/origin/akpm/master || {
+ echo Checkout of remotes/origin/akpm/master failed 1>&2
bash -i || exit
}
-execute git checkout akpm || {
- echo Checkout of top failed 1>&2
- bash -i || exit
-}
-execute git rebase --onto master akpm-base || {
+execute git rebase --onto master remotes/origin/akpm/master-base || {
echo Rebase failed 1>&2
bash -i || exit
}
log '$' cd $cpwd
cd $cpwd
execute git fetch -f ../rebase-tmp akpm:akpm/master || {
- echo Pull failed 1>&2
+ echo Fetch of akpm/master failed 1>&2
bash -i || exit
}
execute rm -rf ../rebase-tmp