InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use git svn rebase instead of git svn fetch & git svn merge

Browse Source 
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
This commit is contained in:
maruel@chromium.org
2009-06-25 19:52:56 +00:00
parent c0b2297c8a
commit 717e1ce5a8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gclient
View File

@@ -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" ]