aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
depot_tools/git-mark-merge-base

7 lines
215 B
Plaintext
Raw Permalink Normal View History Unescape Escape

Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. TEST=run "git cl owners" on FreeBSD BUG= Review URL: https://codereview.chromium.org/197213008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@274320 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
#!/usr/bin/env bash
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
# 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.
Add quotes around paths in bash scripts Follow up to crrev.com/c/2125626. This allows depot_tools commands to run successfully when depot_tools is installed in a path containing spaces. Change-Id: I8f99dbdcb3b1acf27d51ce26b6153f643b8d4dcd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2127675 Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Reviewed-by: Josip Sokcevic <sokcevic@google.com>
5 years ago
. "$(type -P python_runner.sh)"