Google Git
Sign in
gerrit / gerrit / 775958645073d8b1535fa725cebd6a23f7514468
commit775958645073d8b1535fa725cebd6a23f7514468[log] [tgz]
authorEdwin Kempin <edwin.kempin@sap.com>Fri May 03 08:18:44 2013 +0200
committerEdwin Kempin <edwin.kempin@sap.com>Fri May 03 08:18:44 2013 +0200
treeda1f01adf1bc878fd0ed42c88e0ff3acb6481f14
parent2a75561d10ece22410ab91f632d0919723f40395 [diff]
parent383041f948c19d23d15a2d4b959e99090ae8b1a4 [diff]
Merge branch 'stable-2.6'

* stable-2.6:
  Add clarifications in the documentation of the `query` command
  Fix RebaseIfNecessary submit strategy
  Clarify setup of change cache in documentation

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java

Change-Id: I24a16fdb6554b12a2da43b7874b36d77cc97e428
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
tree: da1f01adf1bc878fd0ed42c88e0ff3acb6481f14
  1. contrib/
  2. Documentation/
  3. gerrit-acceptance-tests/
  4. gerrit-antlr/
  5. gerrit-cache-h2/
  6. gerrit-common/
  7. gerrit-extension-api/
  8. gerrit-gwtdebug/
  9. gerrit-gwtexpui/
  10. gerrit-gwtui/
  11. gerrit-httpd/
  12. gerrit-launcher/
  13. gerrit-main/
  14. gerrit-openid/
  15. gerrit-package-plugins/
  16. gerrit-patch-commonsnet/
  17. gerrit-patch-jgit/
  18. gerrit-pgm/
  19. gerrit-plugin-api/
  20. gerrit-plugin-archetype/
  21. gerrit-plugin-gwt-archetype/
  22. gerrit-plugin-gwtui/
  23. gerrit-plugin-js-archetype/
  24. gerrit-prettify/
  25. gerrit-reviewdb/
  26. gerrit-server/
  27. gerrit-sshd/
  28. gerrit-util-cli/
  29. gerrit-util-ssl/
  30. gerrit-war/
  31. ReleaseNotes/
  32. tools/
  33. .gitignore
  34. COPYING
  35. INSTALL
  36. pom.xml
  37. SUBMITTING_PATCHES