From 717e1ce5a8795b0925031625a029bdb8f0b7d59e Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 25 Jun 2009 19:52:56 +0000
Subject: [PATCH] Use git svn rebase instead of git svn fetch & git svn merge

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/147014

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@19277 0039d316-1c4b-4281-b951-d872f2087c98
---
 gclient | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gclient b/gclient
index 3705f0b39..e24103f77 100755
--- a/gclient
+++ b/gclient
@@ -10,7 +10,7 @@ base_dir=$(dirname "$0")
 # Update git checkouts prior the cygwin check, we don't want to use msysgit.
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
 then
-  (cd "$base_dir"; git svn fetch -q; git merge trunk -q)
+  (cd "$base_dir"; git svn rebase -q -q)
 fi
 
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]