You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2017/03/20 16:18:49 UTC
[1/3] beam-site git commit: Simplify merge process section
Repository: beam-site
Updated Branches:
refs/heads/asf-site 6b3775494 -> 3b3bc65c2
Simplify merge process section
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/9a89089e
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/9a89089e
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/9a89089e
Branch: refs/heads/asf-site
Commit: 9a89089e8a8c27339711a2ff61a17a5c7a1875fb
Parents: 6b37754
Author: Zur, Aviem <az...@paypal.com>
Authored: Sun Mar 19 06:16:49 2017 +0200
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Mar 20 09:18:10 2017 -0700
----------------------------------------------------------------------
src/contribute/contribution-guide.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam-site/blob/9a89089e/src/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md
index c1617af..74ee879 100644
--- a/src/contribute/contribution-guide.md
+++ b/src/contribute/contribution-guide.md
@@ -344,9 +344,7 @@ Once you are ready to merge, fetch all remotes, checkout the destination branch
$ git fetch --all
$ git checkout apache/master
- $ git merge --no-ff \
- -m $'[BEAM-<JIRA-issue-#&>;</b>] <Title>\n\nThis closes #<pull-request-#>' \
- finish-pr-<pull-request-#>
+ $ git merge --no-ff -m 'This closes #<pull-request-#>' finish-pr-<pull-request-#>
Always use `--no-ff` option and the specific commit message "This closes #<pull request #>" -- it ensures proper marking in the tooling. It would be nice to include additional information in the merge commit message, such as the title and summary of the pull request.
[2/3] beam-site git commit: Regenerate website
Posted by da...@apache.org.
Regenerate website
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/bf1a64e4
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/bf1a64e4
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/bf1a64e4
Branch: refs/heads/asf-site
Commit: bf1a64e408a2d0443ed855f0aa9591fd48ac233e
Parents: 9a89089
Author: Davor Bonaci <da...@google.com>
Authored: Mon Mar 20 09:18:37 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Mar 20 09:18:37 2017 -0700
----------------------------------------------------------------------
content/contribute/contribution-guide/index.html | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam-site/blob/bf1a64e4/content/contribute/contribution-guide/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/contribution-guide/index.html b/content/contribute/contribution-guide/index.html
index af492a9..f5fefc1 100644
--- a/content/contribute/contribution-guide/index.html
+++ b/content/contribute/contribution-guide/index.html
@@ -627,9 +627,7 @@ $ git checkout -b finish-pr-<pull-request-#> github/pr/<pull-request-#&
<div class="highlighter-rouge"><pre class="highlight"><code>$ git fetch --all
$ git checkout apache/master
-$ git merge --no-ff \
- -m $'[BEAM-<JIRA-issue-#&>;</b>] <Title>\n\nThis closes #<pull-request-#>' \
- finish-pr-<pull-request-#>
+$ git merge --no-ff -m 'This closes #<pull-request-#>' finish-pr-<pull-request-#>
</code></pre>
</div>
[3/3] beam-site git commit: This closes #190
Posted by da...@apache.org.
This closes #190
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/3b3bc65c
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/3b3bc65c
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/3b3bc65c
Branch: refs/heads/asf-site
Commit: 3b3bc65c25d5235cd2899c2d7e22561dd7bc0925
Parents: 6b37754 bf1a64e
Author: Davor Bonaci <da...@google.com>
Authored: Mon Mar 20 09:18:37 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Mar 20 09:18:37 2017 -0700
----------------------------------------------------------------------
content/contribute/contribution-guide/index.html | 4 +---
src/contribute/contribution-guide.md | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------