From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 23 May 2010 15:05:21 +0000 (+0200)
Subject: ./all admin-merge-2: show proper merge preview in the DP repo
X-Git-Tag: xonotic-v0.1.0preview~449
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ca72824267f94000e1ce57d78d07d3ed8dad99c;p=xonotic%2Fxonotic.git

./all admin-merge-2: show proper merge preview in the DP repo
---

diff --git a/all b/all
index 6cdb5032..1e8c6902 100755
--- a/all
+++ b/all
@@ -665,7 +665,7 @@ case "$cmd" in
 				if [ -n "$note" ]; then
 					reportdo4 echo "$note"
 					reportecho4 "--> not merging, already had this one rejected before"
-				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
+				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color master.."$ref"; git diff --color --find-copies-harder --ignore-space-change master..."$ref"; } | less -r'; then
 					git checkout master
 					org=`git rev-parse HEAD`
 					if ! git merge "$ref" 2>&1 | tee "$t"; then