Edwin Kempin 7853c5b94a Use recursive merge by default ...

If two commits that are merged have more than one common predecessor
the recursive merge is superior. In this situation the normal
non-recursive merge may even result in broken files without notice.
This is why the recursive merge should be enabled by default.

Change-Id: I4c5b8b2c6d406ec925da05838696c5c57f2348ef
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

2014-07-15 14:34:07 +00:00

.settings

Eclipse: Bump java source and target level to 7

2013-11-29 00:15:50 +01:00

bucklets

Buck: Allow to co-exist in tree and standalone plugins

2014-06-26 10:59:25 +02:00

contrib

Allow to download reposize.sh script from Gerrit

2014-05-09 16:20:51 +02:00

Documentation

Use recursive merge by default

2014-07-15 14:34:07 +00:00

gerrit-acceptance-tests

Disable Gitweb for in-memory acceptance tests

2014-07-10 17:38:13 +00:00

gerrit-antlr

Buck: Remove usage of genfile()

2014-06-10 07:14:18 +00:00

gerrit-cache-h2

Add REST endpoint to list caches

2014-05-28 09:29:12 +02:00

gerrit-common

Add username to Display In Review Category user preference

2014-06-25 01:02:05 +02:00

gerrit-extension-api

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-gwtdebug

Prevent StackOverflowError in JettyTreeLogger

2014-02-07 12:54:18 +00:00

gerrit-gwtexpui

Fix deprecation warnings introduced with upgrade to GWT 2.6.1

2014-05-30 16:43:47 +09:00

gerrit-gwtui

ChangeScreen2: Always show 'No Score' as label help for zero votings

2014-07-11 14:23:56 +00:00

gerrit-gwtui-common

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-httpd

Fix JS resource loading for JsPlugin type (was returning 404)

2014-07-10 07:39:23 +00:00

gerrit-launcher

Apply "type inference for generic instance creation" Java 7 feature

2014-04-26 15:27:57 +02:00

gerrit-lucene

Lucene: Use stored ChangedLines values

2014-05-23 10:53:23 -07:00

gerrit-main

Build Main for Java 1.2

2013-11-30 01:53:00 -08:00

gerrit-openid

Update Buck

2014-05-04 12:54:17 +02:00

gerrit-patch-commonsnet

Replace 'for' loop with 'foreach'

2013-12-04 01:02:53 +04:00

gerrit-patch-jgit

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-pgm

gerrit.sh: change "1.6" to "1.7"

2014-07-10 15:02:34 +09:00

gerrit-plugin-api

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-plugin-archetype

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-plugin-gwt-archetype

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-plugin-gwtui

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-plugin-js-archetype

Set version to 2.9

2014-07-10 16:14:47 +09:00

gerrit-prettify

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-reviewdb

Add PatchLineCommentsUtil to assist with notedb migration

2014-07-09 11:47:44 -07:00

gerrit-server

Use recursive merge by default

2014-07-15 14:34:07 +00:00

gerrit-solr

Merge changes Iac79af54,Ief41eccc,Iae52ade9,I0bd9eabb,I2ef5b9e1

2014-02-13 17:02:23 +00:00

gerrit-sshd

Update description and error messages in review command

2014-07-11 07:04:35 +00:00

gerrit-util-cli

ReceiveCommits: Add support for approvals

2014-05-08 17:08:44 -07:00

gerrit-util-ssl

Remove unused .gitignore

2013-11-28 22:56:51 -08:00

gerrit-war

Set version to 2.9

2014-07-10 16:14:47 +09:00

lib

Use ban commit REST endpoint in ban-commit SSH command

2014-07-10 13:21:58 +02:00

plugins

Update cookbook plugin to latest revision

2014-07-03 17:23:50 +09:00

ReleaseNotes

Minor update in 2.8 release notes

2014-07-15 11:35:43 +09:00

tools

Allow to download dependencies from insecure connections

2014-07-11 12:35:44 +00:00

website/releases

Exclude gerrit-snapshot-* from releases page

2014-02-19 05:56:00 +00:00

.buckconfig

Buck: Share buck cache directory between multiple source trees

2014-06-12 09:58:24 +02:00

.buckversion

Update Buck

2014-06-24 20:40:48 +00:00

.gitignore

Merge branch 'stable-2.9'

2014-05-27 09:58:38 +09:00

.gitmodules

Add singleusergroup plugin

2013-11-09 07:45:00 +01:00

.pydevproject

Set python version back to 2.6.5 in .pydevproject

2013-05-20 11:36:08 +09:00

BUCK

Update Buck and use gwt_binary()

2014-05-19 11:41:31 -07:00

COPYING

Initial project setup of Gerrit 2

2008-11-14 16:59:34 -08:00

INSTALL

Remove Gerrit 1.x to 2.x import tools

2009-03-27 20:20:10 -07:00

SUBMITTING_PATCHES

Update push URL in SUBMITTING_PATCHES

2012-03-29 00:57:14 -04:00

VERSION

Set version to 2.9

2014-07-10 16:14:47 +09:00

Description

RETIRED, Gerrit as used by OpenStack

120 MiB