gclient.py - Issue 930693002: gclient: Add '--auto_rebase' sync option. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(114)

My Issues | Starred Open | Closed | All

Unified Diff: gclient.py

Issue 930693002: gclient: Add '--auto_rebase' sync option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments

« no previous file with comments | « no previous file | gclient_scm.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gclient.py

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

index f6db225c11c0d94e834580728faf3fad74011ed1..2b9f0504b8ec9eba17b4f9c5ac74a827962b03dc 100755

--- a/gclient.py

+++ b/gclient.py

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

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

help='merge upstream changes instead of trying to '

'fast-forward or rebase')

+ parser.add_option('-A', '--auto-rebase', action='store_true',

hinoka 2015/02/17 18:43:55 nit: the other args use underscores

dnj 2015/02/17 19:57:59 Good catch, I prefer underscores anyway. I blame m

+ help='Automatically rebase repositories against local '

+ 'checkout during update (git only).')

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 »

Powered by Google App Engine

This is Rietveld 408576698