Shawn Pearce 137c303fdd Merge branch 'stable-2.10' ...

Conflicts:
	gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java

Change-Id: I64ca4005da7d3c676954b4da397e5c9566c934a1

2014-08-27 17:18:48 -07:00

..

CherryPick.java

Merge branch 'stable-2.10'

2014-08-27 17:18:48 -07:00

FastForwardOnly.java

Move merge strategy classes to their own subpackage

2014-02-18 09:25:24 +09:00

MergeAlways.java

Fix stale dates in committer field

2014-08-21 12:12:07 +09:00

MergeIfNecessary.java

Fix stale dates in committer field

2014-08-21 12:12:07 +09:00

RebaseIfNecessary.java

Merge branch 'stable-2.9' into stable-2.10

2014-08-27 17:15:39 -07:00

SubmitStrategy.java

Merge branch 'stable-2.9' into stable-2.10

2014-08-27 17:15:39 -07:00

SubmitStrategyFactory.java

Merge branch 'stable-2.9' into stable-2.10

2014-08-27 17:15:39 -07:00