| commit | c91ae924997076a8e6e6f16d1d9fb75f812e0cdd | [log] [tgz] |
|---|---|---|
| author | Cherry Mui <cherryyz@google.com> | Tue May 11 17:07:33 2021 -0400 |
| committer | Cherry Mui <cherryyz@google.com> | Wed Apr 03 20:29:03 2024 +0000 |
| tree | 4c0a5cea9e3bf67b3fa820a95d6909e6e5450de7 | |
| parent | 38b40c0e2b9e3a62d9a99d62fa70595a5f68e6c9 [diff] |
git-codereview: use --no-ff for sync-branch When working with dev branches, it is possible that a branch needed to be sync'd can be fast-forworded. For example, there is no new commit since the last sync. Or this could happen with multi-release-cycle branches, where we reverse-sync'd to master for one release cycle, later try to sync master to branch for the next cycle. Fast-forwording is generally not what we want (and it confuses the git-codereview tool when trying to craft the CL description). Pass --no-ff to ensure we create a merge commit. Change-Id: Ic204882d0304ec538c2e219d34e370ba98db9374 Reviewed-on: https://go-review.googlesource.com/c/review/+/319069 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
The git-codereview tool is a command-line tool for working with Gerrit.
The easiest way to install is to run go install golang.org/x/review/git-codereview@latest. You can also manually git clone the repository to $GOPATH/src/golang.org/x/review.
Run git codereview hooks to install Gerrit hooks for your git repository.
This repository uses Gerrit for code changes. To learn how to submit changes to this repository, see https://golang.org/doc/contribute.html.
The main issue tracker for the review repository is located at https://github.com/golang/go/issues. Prefix your issue with “x/review:” in the subject line, so it is easy to find.