Tool for uploading changesets to Gerrit from git
Go to file
Pierre Riteau 7182166ec0 Fix use of removed --preserve-merges option
The --preserve-merges (-p) option was replaced by --rebase-merges (-r).
This fixes the following error when using git version 2.34.0:

    Errors running git rebase -p -i remotes/gerrit/stable/xena
    fatal: --preserve-merges was replaced by --rebase-merges

In order to keep compatibility with git < 2.18.0 we detect the git
version and use the old --preserve-merges flag when the version is older
than 2.18.0.

Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
Change-Id: I04de3d0f20aa6bafcf746b7706d61dd9b9af296c
2021-11-19 08:25:34 -08:00
doc Doc updates for Git "core.hooksPath" option support 2021-06-24 12:06:12 +02:00
git_review Fix use of removed --preserve-merges option 2021-11-19 08:25:34 -08:00
releasenotes/notes Ignore unstaged/uncommitted submodule changes 2021-07-07 16:08:06 +00:00
.gitignore gitignore: Ignore reno artefacts 2020-01-16 15:14:16 +00:00
.gitreview Corrected git-review project organization 2019-06-19 14:57:13 +00:00
.mailmap Migrate to pbr. 2013-08-15 20:42:37 +00:00
.stestr.conf Switch from testrepository to stestr 2019-02-12 09:58:46 +00:00
.zuul.yaml Fix nodeset selections for zuul jobs 2021-06-17 07:29:08 +02:00
bindep.txt Overhaul Python package metadata and OpenDev URLs 2021-02-26 20:45:24 +00:00
CONTRIBUTING.rst Overhaul Python package metadata and OpenDev URLs 2021-02-26 20:45:24 +00:00
git-review.1 Add option for disabling thin pushes 2021-04-12 11:38:23 -07:00
LICENSE Ported rfc.sh to a standalone program. 2011-09-25 09:16:31 -07:00
README.rst Overhaul Python package metadata and OpenDev URLs 2021-02-26 20:45:24 +00:00
requirements.txt Drop support for py27 2021-01-13 14:10:31 +00:00
setup.cfg Overhaul Python package metadata and OpenDev URLs 2021-02-26 20:45:24 +00:00
setup.py Drop support for py27 2021-01-13 14:10:31 +00:00
test-requirements.txt Install PBR explicitly 2021-04-23 10:42:35 -07:00
tox.ini Install PBR explicitly 2021-04-23 10:42:35 -07:00

git-review

A git command for submitting branches to Gerrit

git-review is a tool that helps submitting Git branches to Gerrit for review.