gclient.py - Issue 7277035: Add --merge option to gclient sync.

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.py

Issue 7277035: Add --merge option to gclient sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 9 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.py

diff --git a/gclient.py b/gclient.py

index 4cc4186c63d6b8782b43a9736ac5708beff83121..93bc8b4dcadd1679decb68f5a5b88274944a1246 100644

--- a/gclient.py

+++ b/gclient.py

@@ -1090,6 +1090,9 @@ def CMDsync(parser, args):

'local modifications')

parser.add_option('-R', '--reset', action='store_true',

help='resets any local changes before updating (git only)')

+ parser.add_option('-M', '--merge', action='store_true',

+ help='merge upstream changes instead of trying to '

+ 'fast-forward or rebase')

parser.add_option('--deps', dest='deps_os', metavar='OS_LIST',

help='override deps for the specified (comma-separated) '

'platform(s); \'all\' will process all deps_os '

« no previous file with comments | « no previous file | gclient_scm.py » ('j') | no next file with comments »