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.
This option creates a new branch that sets itself as the upstream for
the current branch and adopts the current branch's upstream as its own.
What does it do?
----------------
Imagine we have the following set of branches (as `git map-branches -vv`
would show it):
origin/master 00001111 [ ahead 1 ]
foo 00002222 [ ahead 1 ]
baz * 00003333 [ ahead 1 ]
'baz' is the current branch. If one were to issue the following command:
$ git new-branch --inject-current bar
... then the branch layout will now look like this:
origin/master 00001111 [ ahead 1 ]
foo 00002222 [ ahead 1 ]
bar * 00002222
baz 00003333 [ ahead 1 ]
Why would you need this?
------------------------
When working on a single change or a sequence of changes organized into
dependent branches, this option lets you quickly create a new branch
with the correct upstreams so that you can peel off smaller cleanups and
potentially unrelated changes out of your main feature branch into
separate branches. These can then be uploaded as dependent CLs.
R=petermayo@chromium.org,iannucci@chromium.org
Change-Id: Id912f8e5c17e267fc52d74bdfac7bbcf87a50908
Reviewed-on: https://chromium-review.googlesource.com/987529
Commit-Queue: Asanka Herath <asanka@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
|
8 years ago | |
|---|---|---|
| bootstrap/win | 8 years ago | |
| fetch_configs | 8 years ago | |
| git-templates | ||
| infra | 8 years ago | |
| man | 8 years ago | |
| recipes | 8 years ago | |
| support | ||
| testing_support | 8 years ago | |
| tests | 8 years ago | |
| third_party | 8 years ago | |
| win_toolchain | 8 years ago | |
| zsh-goodies | ||
| .gitattributes | 8 years ago | |
| .gitignore | 8 years ago | |
| .style.yapf | ||
| LICENSE | ||
| OWNERS | 8 years ago | |
| PRESUBMIT.py | 8 years ago | |
| README.gclient.md | 9 years ago | |
| README.git-cl.md | 9 years ago | |
| README.md | 9 years ago | |
| README.testing | ||
| WATCHLISTS | 9 years ago | |
| annotated_gclient.py | ||
| appengine_mapper.py | 9 years ago | |
| apply_issue | ||
| apply_issue.bat | 9 years ago | |
| apply_issue.py | 9 years ago | |
| auth.py | 8 years ago | |
| autoninja | 8 years ago | |
| autoninja.bat | 8 years ago | |
| autoninja.py | 8 years ago | |
| breakpad.py | 10 years ago | |
| buildbucket.py | ||
| cbuildbot | ||
| checkout.py | 8 years ago | |
| chrome_set_ver | ||
| cipd | 8 years ago | |
| cipd.bat | 8 years ago | |
| cipd.ps1 | 8 years ago | |
| cipd_bin_setup.bat | 8 years ago | |
| cipd_bin_setup.sh | 8 years ago | |
| cipd_client_version | 8 years ago | |
| cipd_manifest.txt | 8 years ago | |
| cit | ||
| cit.bat | 9 years ago | |
| cit.py | 8 years ago | |
| clang-format | ||
| clang-format.bat | 9 years ago | |
| clang_format.py | 9 years ago | |
| clang_format_merge_driver | 9 years ago | |
| clang_format_merge_driver.bat | 9 years ago | |
| clang_format_merge_driver.py | 9 years ago | |
| codereview.settings | 9 years ago | |
| compile_single_file | 8 years ago | |
| compile_single_file.bat | 8 years ago | |
| compile_single_file.py | 8 years ago | |
| cpplint.bat | 9 years ago | |
| cpplint.py | 8 years ago | |
| cpplint_chromium.py | ||
| cros | ||
| cros_sdk | ||
| dart_format.py | ||
| depot-tools-auth | ||
| depot-tools-auth.bat | 9 years ago | |
| depot-tools-auth.py | 10 years ago | |
| detect_host_arch.py | 8 years ago | |
| download_from_google_storage | ||
| download_from_google_storage.bat | 9 years ago | |
| download_from_google_storage.py | 8 years ago | |
| ensure_bootstrap | 8 years ago | |
| fetch | ||
| fetch.bat | 9 years ago | |
| fetch.py | 8 years ago | |
| fix_encoding.py | 9 years ago | |
| gclient | 10 years ago | |
| gclient-new-workdir.py | 8 years ago | |
| gclient.bat | 9 years ago | |
| gclient.py | 8 years ago | |
| gclient_completion.sh | ||
| gclient_eval.py | 8 years ago | |
| gclient_scm.py | 8 years ago | |
| gclient_utils.py | 8 years ago | |
| gerrit_client.py | 8 years ago | |
| gerrit_util.py | 8 years ago | |
| git-cache | 10 years ago | |
| git-cl | 10 years ago | |
| git-crrev-parse | 8 years ago | |
| git-crsync | ||
| git-drover | 10 years ago | |
| git-find-releases | 10 years ago | |
| git-footers | 10 years ago | |
| git-freeze | 10 years ago | |
| git-gs | 9 years ago | |
| git-hyper-blame | 10 years ago | |
| git-map | 10 years ago | |
| git-map-branches | 10 years ago | |
| git-mark-merge-base | 10 years ago | |
| git-nav-downstream | 10 years ago | |
| git-nav-upstream | ||
| git-new-branch | 10 years ago | |
| git-number | 10 years ago | |
| git-rebase-update | 10 years ago | |
| git-rename-branch | 10 years ago | |
| git-reparent-branch | 10 years ago | |
| git-retry | 10 years ago | |
| git-runhooks | ||
| git-squash-branch | 10 years ago | |
| git-thaw | 10 years ago | |
| git-upstream-diff | 10 years ago | |
| git_cache.py | 8 years ago | |
| git_cl.py | 8 years ago | |
| git_cl_completion.sh | 9 years ago | |
| git_common.py | 8 years ago | |
| git_dates.py | 10 years ago | |
| git_drover.py | 8 years ago | |
| git_find_releases.py | ||
| git_footers.py | 8 years ago | |
| git_freezer.py | ||
| git_hyper_blame.py | 8 years ago | |
| git_map.py | 9 years ago | |
| git_map_branches.py | 8 years ago | |
| git_mark_merge_base.py | ||
| git_nav_downstream.py | ||
| git_new_branch.py | 8 years ago | |
| git_number.py | 9 years ago | |
| git_rebase_update.py | 8 years ago | |
| git_rename_branch.py | ||
| git_reparent_branch.py | 10 years ago | |
| git_retry.py | 9 years ago | |
| git_squash_branch.py | 9 years ago | |
| git_upstream_diff.py | 8 years ago | |
| gn | ||
| gn.bat | 9 years ago | |
| gn.py | ||
| gsutil.py | 8 years ago | |
| gsutil.vpython | 8 years ago | |
| led | 8 years ago | |
| led.bat | 8 years ago | |
| luci-auth | 8 years ago | |
| luci-auth.bat | 8 years ago | |
| mac_toolchain | 8 years ago | |
| my_activity.py | 8 years ago | |
| my_reviews.py | 8 years ago | |
| ninja | 8 years ago | |
| ninja-linux32 | 8 years ago | |
| ninja-linux64 | 8 years ago | |
| ninja-mac | 8 years ago | |
| ninja.exe | 8 years ago | |
| owners.py | 8 years ago | |
| owners_finder.py | 8 years ago | |
| patch.py | 8 years ago | |
| post_build_ninja_summary.py | 8 years ago | |
| presubmit_canned_checks.py | 8 years ago | |
| presubmit_support.py | 8 years ago | |
| profile.xml | ||
| prpc | 8 years ago | |
| prpc.bat | 8 years ago | |
| pylint | ||
| pylint.py | 10 years ago | |
| pylintrc | 9 years ago | |
| python_runner.sh | 10 years ago | |
| repo | 9 years ago | |
| rietveld.py | 8 years ago | |
| roll-dep | ||
| roll-dep-svn | 9 years ago | |
| roll-dep-svn.bat | 9 years ago | |
| roll-dep.bat | 9 years ago | |
| roll_dep.py | 8 years ago | |
| roll_dep_svn.py | 8 years ago | |
| scm.py | 8 years ago | |
| setup_color.py | 9 years ago | |
| split_cl.py | 8 years ago | |
| subcommand.py | 9 years ago | |
| subprocess2.py | 9 years ago | |
| update_depot_tools | 8 years ago | |
| update_depot_tools.bat | 8 years ago | |
| update_depot_tools_toggle.py | 9 years ago | |
| upload_to_google_storage.py | 8 years ago | |
| vpython | 8 years ago | |
| vpython.bat | 8 years ago | |
| watchlists.py | 8 years ago | |
| weekly | ||
| wtf | ||
README.md
depot_tools
Tools for working with Chromium development. It requires python 2.7.
Tools
The most important tools are:
fetch: Agclientwrapper to checkout a project. Usefetch --helpfor more details.gclient: A meta-checkout tool. Think repo or git submodules, except that it support OS-specific rules, e.g. do not checkout Windows only dependencies when checking out for Android. Usegclient helpfor more details and README.gclient.md.git cl: A code review tool to interact with Rietveld or Gerrit. Usegit cl helpfor more details and README.git-cl.md.roll-dep: A gclient dependency management tool to submit a dep roll, updating a dependency to a newer revision.
There are a lot of git utilities included.
Updating
depot_tools updates itself automatically when running gclient tool. To
disable auto update, set the environment variable DEPOT_TOOLS_UPDATE=0.
To update package manually, run update_depot_tools.bat on Windows,
or ./update_depot_tools on Linux or Mac.
On Windows only, running gclient will install git and python.
Contributing
To contribute change for review:
git new-branch <somename>
# Hack
git add .
git commit -a -m "Fixes goat teleporting"
# find reviewers
git cl owners
git log -- <yourfiles>
# Request a review.
git cl upload -r reviewer1@chromium.org,reviewer2@chromium.org --send-mail
# Edit change description if needed.
git cl desc
# If change is approved, flag it to be committed.
git cl set-commit
# If change needs more work.
git rebase-update
...
git cl upload -t "Fixes goat teleporter destination to be Australia"
See also open bugs, open reviews, forum or report problems.
cpplint.py
To update cpplint.py, please submit the change upstream first at https://github.com/google/styleguide/tree/gh-pages/cpplint then copy it down.