From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 25 May 2010 11:01:32 +0000 (+0200)
Subject: fix another bug in ./all branch
X-Git-Tag: xonotic-v0.1.0preview~448
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=99b2d0ac993587d600badfec069d08855fd2f948

fix another bug in ./all branch
---

diff --git a/all b/all
index 1e8c6902..4c649642 100755
--- a/all
+++ b/all
@@ -308,7 +308,7 @@ case "$cmd" in
 						# TODO do this without pushing
 						verbose git checkout -b "$branch" "$b"
 						verbose git config "branch.$branch.remote" "$remote"
-						verbose git config "branch.$branch.merge" "refs/heads/$b"
+						verbose git config "branch.$branch.merge" "refs/heads/$branch"
 						verbose git push origin "$branch"
 					fi
 				fi