chromium_depot_tools/git-upstream-diff at c050a5b2be707d349226b71b426f3a6ad0453fc9 - chromium_depot_tools - InTheForest

InTheForest/chromium_depot_tools

mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00

Files

iannucci@chromium.org c050a5b2be Add a family of git-commands to assist with the management of multiple CLs/branches.

git-rebase-update - ensure all branches are up to date
git-new-branch - create branches
git-rename-branch - rename a branch while preserving parentage relationships
git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent.
git-squash-branch - collapse a branch into a single commit
git-upstream-diff - show the diff between the current branch and it's upstream branch
git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch.

R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org
BUG=261738

Review URL: https://codereview.chromium.org/184253003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98

2014-03-26 06:18:50 +00:00

10 lines

300 B

Bash

Executable File

Raw Blame History

 #!/bin/bash
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # git_upstream_diff.py -- Provide the diff between the current branch and its
 # upstream.
 . $(type -P python_git_runner.sh)