gclient - Issue 147014: Use git svn rebase instead of git svn fetch & git svn merge

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gclient

Issue 147014: Use git svn rebase instead of git svn fetch & git svn merge (Closed)

Patch Set: Created 11 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gclient

diff --git a/gclient b/gclient

index 3705f0b3978b911f7e32188ae9a98a4cab0aa024..e24103f77a7fe91e75ae8f8fd2e0b34d73646b69 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)

if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]

« no previous file with comments | « no previous file | no next file » | no next file with comments »