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
LUCI-TryBot-Result: Go LUCI <>
Reviewed-by: Dmitri Shuralyov <>
Reviewed-by: Dmitri Shuralyov <>
1 file changed
tree: 4c0a5cea9e3bf67b3fa820a95d6909e6e5450de7
  1. git-codereview/
  2. .gitattributes
  3. codereview.cfg
  5. go.mod


The git-codereview tool is a command-line tool for working with Gerrit.


The easiest way to install is to run go install You can also manually git clone the repository to $GOPATH/src/

Run git codereview hooks to install Gerrit hooks for your git repository.

Report Issues / Send Patches

This repository uses Gerrit for code changes. To learn how to submit changes to this repository, see

The main issue tracker for the review repository is located at Prefix your issue with “x/review:” in the subject line, so it is easy to find.