From 526d123c6d680b8ab7abee92590909b50fdf919b Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 25 Jun 2008 10:13:28 -0400
Subject: [PATCH] [sde-update-tree] Changed to use `git pull --rebase` which is
 smarter

---
 bin/sde-update-tree | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sde-update-tree b/bin/sde-update-tree
index f947e49..2f5fa1b 100755
--- a/bin/sde-update-tree
+++ b/bin/sde-update-tree
@@ -81,7 +81,7 @@ for x in . package $( ls -1d package/* target/* 2> /dev/null ); do
 	elif [ -d "$x/.git" ]; then
 		cd "$x";
 		echo "$tree/$x:"
-		( git fetch --quiet && git reset && git rebase origin ) 2>&1 | indent_output
+		( git reset && git pull --rebase ) 2>&1 | indent_output
 		cd - > /dev/null
 	elif [ -d "$x/.svn" ]; then
 		cd "$x";