From 6d523e1a56bc54b65e2bc35f5a2857a2255d08ba Mon Sep 17 00:00:00 2001 From: Mandeep Singh Baines Date: Thu, 5 Aug 2010 11:39:03 -0700 Subject: [PATCH] cros_mark_as_stable: modify push to use tracking branch BUG=5258 TEST=Successfully pushed. Change-Id: I985da7577e88f4a734f8281cae4aafce8dda5933 Review URL: http://codereview.chromium.org/3046051 --- cros_mark_as_stable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py index d9373c05ef..3af5df8890 100755 --- a/cros_mark_as_stable.py +++ b/cros_mark_as_stable.py @@ -131,7 +131,7 @@ def _PushChange(): _RunCommand('git cl upload --desc_from_logs -m "%s"' % 'Marking set of ebuilds as stable') _RunCommand('git remote update') - _RunCommand('git rebase origin/master') + _RunCommand('git rebase %s' % gflags.FLAGS.tracking_branch) _RunCommand('git cl push %s' % gflags.FLAGS.push_options)