From: Rudolf Polzer <divVerent@alientrap.org>
Date: Sat, 8 May 2010 12:49:01 +0000 (+0200)
Subject: make adminmerge more covnenient
X-Git-Tag: xonotic-v0.1.0preview~471
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=ff786842ab496a0bfb63fb87a806b2c9fc395e34;ds=sidebyside

make adminmerge more covnenient
---

diff --git a/all b/all
index 17314d90..e9134bf7 100755
--- a/all
+++ b/all
@@ -562,6 +562,9 @@ case "$cmd" in
 		rm -rf "$patchdir"
 		;;
 	admin-merge)
+		if [ "$#" = 2 ]; then
+			set -- "${1%%/*}" "${1#*/}"
+		fi
 		for d in $repos; do
 			enter "$d0/$d" verbose
 			git rev-parse "$1/$2" || continue