Skip to content

Update to latest java-repo-tools. #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jun 20, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
15930b4
Use java-repo-tools checkstyle plugins.
tswast Mar 22, 2016
dd718e0
Checkstyle fixes.
tswast Mar 29, 2016
f89ed2e
Merge branch 'master' of github.com:GoogleCloudPlatform/java-repo-too…
tswast Apr 12, 2016
f8e7856
Remove recommendation to create a branch.
tswast Apr 12, 2016
6b6a900
Added few more sample code for Search API. (#173)
Apr 21, 2016
ab2212d
Add sample for App Engine Datastore setDistinct projection queries.
tswast Apr 21, 2016
8ee5b8d
Update coveralls plugin for code coverage analysis. (#194)
tswast Apr 26, 2016
f2e19b6
Use codecov for coverage. (#199)
tswast Apr 26, 2016
5574790
Add Datastore indexes samples. (#214)
tswast Apr 29, 2016
bbaa0fc
Use the subtree command to push changes upstream.
tswast May 2, 2016
9315c4d
Merge pull request #10 from GoogleCloudPlatform/java-repo-tools-updat…
tswast May 2, 2016
6ee0542
Use subtree command instead of git plumbing.
tswast May 3, 2016
90a280d
Merge branch 'master' of github.com:GoogleCloudPlatform/java-repo-too…
tswast Jun 9, 2016
89c888d
Support App Engine or Jetty for local testing.
tswast Jun 10, 2016
494d6cb
Add localhost tests to Travis.
tswast Jun 13, 2016
0cd0a1e
Merge branch 'master' of github.com:GoogleCloudPlatform/java-repo-too…
tswast Jun 20, 2016
3686a49
test-devserver.sh is replaced by scripts/test-localhost.sh.
tswast Jun 20, 2016
1d046f9
Merge pull request #11 from GoogleCloudPlatform/tswast-push-java-repo…
tswast Jun 20, 2016
029773a
Merge branch 'master' of github.com:GoogleCloudPlatform/java-repo-too…
tswast Jun 20, 2016
346295f
Use test-localhost.sh script.
tswast Jun 20, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test-devserver.sh is replaced by scripts/test-localhost.sh.
Also, update the README instructions for how to push changes upstream.
  • Loading branch information
tswast committed Jun 20, 2016
commit 3686a49cf8b3867fbcf74e03efdbd7993c9582d7
15 changes: 3 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,9 @@ The first time using the `subtree` command, we may need to use the `--rejoin`
argument.

```
git subtree split --prefix=java-repo-tools -b java-repo-tools-update-from-java-docs-samples
git checkout java-repo-tools-update-from-java-docs-samples
git push java-repo-tools java-repo-tools-update-from-java-docs-samples
```

After you have committed all the changes you want to your `java-repo-tools`
branch, you can push to the upstream `java-repo-tools` repository with the
following command. (Replace `name-for-remote-branch` with the name you'd like to
give the branch on the `java-repo-tools` repository.)

```
git push java-repo-tools java-repo-tools:name-for-remote-branch
git subtree split --prefix=java-repo-tools -b ${USER}-push-java-repo-tools
git checkout ${USER}-push-java-repo-tools
git push java-repo-tools ${USER}-push-java-repo-tools
```

Then, you can send a pull request to the `java-repo-tools` repository.
Expand Down
52 changes: 0 additions & 52 deletions test-devserver.sh

This file was deleted.