You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/01/06 22:12:43 UTC
[2/2] incubator-freemarker-site git commit: Added to Committer
how-to: Closing GitHub PR requests without merging
Added to Committer how-to: Closing GitHub PR requests without merging
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/70aa33ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/70aa33ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/70aa33ad
Branch: refs/heads/master
Commit: 70aa33adee469b8f5e86316e2345cf1504434985
Parents: db9c95d
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 23:12:43 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 23:12:43 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 35 ++++++++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/70aa33ad/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 56f89cd..52e513f 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1342,14 +1342,14 @@ two freemarker.jar-s and unpredictable behavior!
<itemizedlist>
<listitem>
<para><literal> <replaceable><PROJECT></replaceable>
- </literal> is usually
+ </literal>is usually
<literal>incubator-freemarker</literal></para>
</listitem>
<listitem>
<para><literal> <replaceable><PR_NUMBER></replaceable>
- </literal> is the pull request number that GitHub shows
- prominently after a <quote>#</quote></para>
+ </literal>is the pull request number that GitHub shows prominently
+ after a <quote>#</quote></para>
</listitem>
</itemizedlist>
@@ -1365,6 +1365,35 @@ two freemarker.jar-s and unpredictable behavior!
close the pull request on Github.</para>
</section>
+ <section xml:id="close-pull-request-without-merging">
+ <title>Closing GitHub pull requests without merging</title>
+
+ <programlisting language="unknown">git commit --allow-empty -m "closes apache/<PROJECT>#<PR_NUMBER>: <WHY>"</programlisting>
+
+ <para>Where:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><literal> <replaceable><PROJECT></replaceable>
+ </literal>is usually
+ <literal>incubator-freemarker</literal></para>
+ </listitem>
+
+ <listitem>
+ <para><literal> <replaceable><PR_NUMBER></replaceable>
+ </literal>is the pull request number that GitHub shows prominently
+ after a <quote>#</quote></para>
+ </listitem>
+
+ <listitem>
+ <para><literal> <replaceable><WHY></replaceable>
+ </literal>is the reason of the closing. For clarity, you may want
+ to end it with <quote>Closed PR without merging.</quote> or
+ something similar.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
<section xml:id="making-releases">
<title>Making releases</title>