From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 18 Nov 2012 14:11:38 +0000 (-0500)
Subject: Merge branch 'master' of ssh://feistymeow.org/feisty_meow
X-Git-Tag: 2.140.90~1180
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e184d83e93e03f35a03cddfd8006a7793f8c4913;hp=c1ef72a9bd5a0a37de0707444f94726e9adbf3e5;p=feisty_meow.git

Merge branch 'master' of ssh://feistymeow.org/feisty_meow
---

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
index c80a1f61..488e931c 100644
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -36,7 +36,7 @@ function do_update()
   elif [ -d ".svn" ]; then
     svn update .
   elif [ -d ".git" ]; then
-    git pull
+    git pull 2>&1 | grep -v "X11 forwarding request failed"
   else
     echo unknown repository for $directory...
   fi