Google Git
Sign in
gerrit/gerrit/67ef399634024ff971a6ab0cdc18c2a1bed74d02
commit
67ef399634024ff971a6ab0cdc18c2a1bed74d02
[log]
author
Shawn Pearce <sop@google.com>
Wed Feb 18 23:18:16 2015 +0000
committer
Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed Feb 18 23:18:17 2015 +0000
tree
008dae76e8b61eb76b02eee2fd1b7a84cf1019fb
parent
2ecf23c68a55245ef26e570e989abf2d0d09f8e9 [diff]
parent
8cbf929a206894fe6965629b05bf436a4cd41f22 [diff]
Merge changes from topic 'cherrypick'

* changes:
  CherryPick: Keep going in the face of a single merge conflict
  CherryPick: Test for submitting a subset of dependent changes
tree: 008dae76e8b61eb76b02eee2fd1b7a84cf1019fb
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-tests/
  6. gerrit-antlr/
  7. gerrit-cache-h2/
  8. gerrit-common/
  9. gerrit-extension-api/
  10. gerrit-gwtdebug/
  11. gerrit-gwtexpui/
  12. gerrit-gwtui/
  13. gerrit-gwtui-common/
  14. gerrit-httpd/
  15. gerrit-launcher/
  16. gerrit-lucene/
  17. gerrit-main/
  18. gerrit-openid/
  19. gerrit-patch-commonsnet/
  20. gerrit-patch-jgit/
  21. gerrit-pgm/
  22. gerrit-plugin-api/
  23. gerrit-plugin-archetype/
  24. gerrit-plugin-gwt-archetype/
  25. gerrit-plugin-gwtui/
  26. gerrit-plugin-js-archetype/
  27. gerrit-prettify/
  28. gerrit-reviewdb/
  29. gerrit-server/
  30. gerrit-solr/
  31. gerrit-sshd/
  32. gerrit-util-cli/
  33. gerrit-util-http/
  34. gerrit-util-ssl/
  35. gerrit-war/
  36. lib/
  37. plugins/
  38. ReleaseNotes/
  39. tools/
  40. website/
  41. .buckconfig
  42. .buckversion
  43. .gitignore
  44. .gitmodules
  45. .mailmap
  46. .pydevproject
  47. .watchmanconfig
  48. BUCK
  49. COPYING
  50. INSTALL
  51. SUBMITTING_PATCHES
  52. VERSION