update_depot_tools.bat - Issue 10913193: Rebase explicitly origin/master instead of guessing from the remote.

Side by Side Diff

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

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

Side by Side Diff: update_depot_tools.bat

Issue 10913193: Rebase explicitly origin/master instead of guessing from the remote. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

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

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 @echo off	1 @echo off

2 :: Copyright (c) 2012 The Chromium Authors. All rights reserved.	2 :: Copyright (c) 2012 The Chromium Authors. All rights reserved.

3 :: Use of this source code is governed by a BSD-style license that can be	3 :: Use of this source code is governed by a BSD-style license that can be

4 :: found in the LICENSE file.	4 :: found in the LICENSE file.

5	5

6 :: This batch file will try to sync the root directory.	6 :: This batch file will try to sync the root directory.

7	7

8 setlocal	8 setlocal

9	9

10 :: Will download svn and python.	10 :: Will download svn and python.

(...skipping 18 matching lines...) Expand all Loading...
29 :SVN_UPDATE	29 :SVN_UPDATE

30 call svn up -q "%~dp0."	30 call svn up -q "%~dp0."

31 goto :EOF	31 goto :EOF

32	32

33	33

34 :GIT_UPDATE	34 :GIT_UPDATE

35 cd /d "%~dp0."	35 cd /d "%~dp0."

36 call git config remote.origin.fetch > NUL	36 call git config remote.origin.fetch > NUL

37 if errorlevel 1 goto :GIT_SVN_UPDATE	37 if errorlevel 1 goto :GIT_SVN_UPDATE

38 call git fetch -q origin > NUL	38 call git fetch -q origin > NUL

39 call git rebase -q origin > NUL	39 call git rebase -q origin/master > NUL

40 goto :EOF	40 goto :EOF

41	41

42 :GIT_SVN_UPDATE	42 :GIT_SVN_UPDATE

43 cd /d "%~dp0."	43 cd /d "%~dp0."

44 call git svn rebase -q -q	44 call git svn rebase -q -q

45 goto :EOF	45 goto :EOF

OLD	NEW

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