commit | 19238fc343b2404d13550dfe30d99708e1df7716 | [log] [tgz] |
---|---|---|
author | Clemens Hammacher <clemensh@chromium.org> | Wed Dec 05 10:47:05 2018 |
committer | Commit Bot <commit-bot@chromium.org> | Wed Dec 05 10:47:05 2018 |
tree | 0dcd79c03e2c8703f6e42b8dccaa208662729b3d | |
parent | 687ca907fdb9a879c6f162db61b15de67178868a [diff] |
Revert "Fix semantics of git new-branch --upstream" This reverts commit ba83229a731721ff888374b0ba6eab8ec80fb652. Reason for revert: After mail discussion we came to the conclusion that the old behavior makes more sense. Original change's description: > Fix semantics of git new-branch --upstream > > Currently, the "--upstream A" option for new-branch behaves totally > different than "--upstream_current". While "--upstream A" checks out > branch A and then creates a new branch which tracks A, > "--upstream_current" creates a new branch for the current HEAD and sets > the upstream to the previously checked out branch. > > As the documentation does not mention that any of the options changes > the currently-checked-out commit (HEAD), this CL changes the semantics > of "git new-branch --upstream A B" to be identical to "git checkout -b B > && git branch --set-upstream-to A". > > It also slightly extends the documentation to mention that in any case > the new branch is based on HEAD. > > R=​iannucci@chromium.org > > Change-Id: Ic335d2caf27cb6afca1b8bc5a008424c0e880fca > Reviewed-on: https://chromium-review.googlesource.com/c/1350748 > Reviewed-by: Robbie Iannucci <iannucci@chromium.org> > Commit-Queue: Clemens Hammacher <clemensh@chromium.org> > Auto-Submit: Clemens Hammacher <clemensh@chromium.org> TBR=iannucci@chromium.org,tandrii@chromium.org,clemensh@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I7463935af172f0801c7da94d2de106a02fc4c42e Reviewed-on: https://chromium-review.googlesource.com/c/1362972 Reviewed-by: Sergiy Belozorov <sergiyb@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Tools for working with Chromium development. It requires python 2.7.
The most important tools are:
fetch
: A gclient
wrapper to checkout a project. Use fetch --help
for 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. Use gclient help
for more details and README.gclient.md.git cl
: A code review tool to interact with Rietveld or Gerrit. Use git cl help
for 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.
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
.
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.
To update cpplint.py, please submit the change upstream first at https://github.com/google/styleguide/tree/gh-pages/cpplint then copy it down.