Commit Graph

2 Commits (1132f5f896e1efc5ff177bab377e34d5cd1a1ebd)

Author SHA1 Message Date
iannucci@chromium.org de70b1549f Make udiff print reasonable errors while not on a branch.
R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259647 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
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
11 years ago