update_depot_tools - Issue 10784045: Fix update_depot_tools for git checkout

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: update_depot_tools

Issue 10784045: Fix update_depot_tools for git checkout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 5 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: update_depot_tools

diff --git a/update_depot_tools b/update_depot_tools

index f60d87e957b45a98c30d68a570dc554214bcb859..dcb8d1463792e2452125c1f84e42fd94ec07aebf 100755

--- a/update_depot_tools

+++ b/update_depot_tools

@@ -70,7 +70,7 @@ function is_git_clone_repo {

function update_git_repo {

if is_git_clone_repo; then

git fetch -q origin > /dev/null

- git rebase -q origin > /dev/null

+ git rebase -q origin/master > /dev/null

return 0

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