From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 23 May 2010 12:51:44 +0000 (+0200)
Subject: try fixing ./all branch
X-Git-Tag: xonotic-v0.1.0preview~450
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=ba9bdae30bf22a8ac1bf6f03ca97ce954cef5f36

try fixing ./all branch
---

diff --git a/all b/all
index 38b65d5c..6cdb5032 100755
--- a/all
+++ b/all
@@ -306,8 +306,10 @@ case "$cmd" in
 							verbose git fetch origin || true
 						fi
 						# TODO do this without pushing
-						verbose git push "$remote" "$b":"$branch"
-						verbose git checkout --track -b "$branch" "$remote/$branch"
+						verbose git checkout -b "$branch" "$b"
+						verbose git config "branch.$branch.remote" "$remote"
+						verbose git config "branch.$branch.merge" "refs/heads/$b"
+						verbose git push origin "$branch"
 					fi
 				fi
 				cd "$d0"