Google Git
Sign in
gerrit / gerrit / b786b937fa0d8857c039170f3ad979ed026c4e37
commitb786b937fa0d8857c039170f3ad979ed026c4e37[log] [tgz]
authorZhen Chen <czhen@google.com>Thu Sep 15 11:22:26 2016 -0700
committerZhen Chen <czhen@google.com>Fri Sep 16 14:12:14 2016 -0700
tree2205c6f37ee61fb2bd78d1079cb2a50f617b1227
parent27ce157caca3ddcd3b1b46c95417208b7843ae76 [diff]
Allow use `theirs` merge strategy to snap back to previous commit

Normally, merge an merged commit is not allowed. However, there is a
special case that user want to snap back to an older commit but keep the
history. The way to do this is using `theirs` merge strategy to create a
merge change.

Change-Id: I93fbd7157c6f723d79728c7a8c95f3034b762716
1 file changed
tree: 2205c6f37ee61fb2bd78d1079cb2a50f617b1227
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-framework/
  6. gerrit-acceptance-tests/
  7. gerrit-antlr/
  8. gerrit-cache-h2/
  9. gerrit-common/
  10. gerrit-extension-api/
  11. gerrit-gpg/
  12. gerrit-gwtdebug/
  13. gerrit-gwtexpui/
  14. gerrit-gwtui/
  15. gerrit-gwtui-common/
  16. gerrit-httpd/
  17. gerrit-launcher/
  18. gerrit-lucene/
  19. gerrit-main/
  20. gerrit-oauth/
  21. gerrit-openid/
  22. gerrit-patch-commonsnet/
  23. gerrit-patch-jgit/
  24. gerrit-pgm/
  25. gerrit-plugin-api/
  26. gerrit-plugin-archetype/
  27. gerrit-plugin-gwt-archetype/
  28. gerrit-plugin-gwtui/
  29. gerrit-plugin-js-archetype/
  30. gerrit-prettify/
  31. gerrit-reviewdb/
  32. gerrit-server/
  33. gerrit-sshd/
  34. gerrit-util-cli/
  35. gerrit-util-http/
  36. gerrit-util-ssl/
  37. gerrit-war/
  38. lib/
  39. plugins/
  40. polygerrit-ui/
  41. ReleaseNotes/
  42. tools/
  43. website/
  44. .bazelrc
  45. .buckconfig
  46. .buckversion
  47. .editorconfig
  48. .gitignore
  49. .gitmodules
  50. .mailmap
  51. .pydevproject
  52. .watchmanconfig
  53. BUCK
  54. COPYING
  55. INSTALL
  56. README.md
  57. SUBMITTING_PATCHES
  58. VERSION
  59. WORKSPACE
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Objective

Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.

Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

Gerrit is the work of hundreds of contributors. We appreciate your help!

Please read the contribution guidelines.

Note that we do not accept Pull Requests via the Github mirror.

Getting in contact

The IRC channel on freenode is #gerrit. An archive is available at: echelog.com.

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Buck and run the following:

    git clone --recursive https://gerrit.googlesource.com/gerrit
    cd gerrit && buck build release

Install binary packages (Deb/Rpm)

The instruction how to configure GerritForge/BinTray repositories is here

On Debian/Ubuntu run:

    apt-get update & apt-get install gerrit=<version>-<release>

NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.

On CentOS/RedHat run:

    yum clean all && yum install gerrit-<version>[-<release>]

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.