From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 25 Jun 2010 18:52:31 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~391^2~5
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a8107a6553508c297ccdd8f0f701cf2b541370ce

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

a8107a6553508c297ccdd8f0f701cf2b541370ce
diff --cc all
index bba700ae,ccc9667e..35bc418f
--- a/all
+++ b/all
@@@ -647,12 -669,12 +647,17 @@@ case "$cmd" i
  					HEAD|master)
  						continue
  						;;
+ 					*/*)
+ 					   	;;
+ 					*)
+ 						continue
+ 						;;
  				esac
 +				if [ -n "$branch" ]; then
 +					if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
 +						continue
 +					fi
 +				fi
  				reportecho "  Branch $ref:"
  				note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
  				logdata=`git log --color "$base".."$ref"`