freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/2] incubator-freemarker-site git commit: Added to Committer how-to: Closing GitHub PR requests without merging
Date Fri, 06 Jan 2017 22:12:43 GMT
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 <ddekany@apache.org>
Authored: Fri Jan 6 23:12:43 2017 +0100
Committer: ddekany <ddekany@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>&lt;PROJECT&gt;</replaceable>
-            </literal> is usually
+            </literal>is usually
             <literal>incubator-freemarker</literal></para>
           </listitem>
 
           <listitem>
             <para><literal> <replaceable>&lt;PR_NUMBER&gt;</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/&lt;PROJECT&gt;#&lt;PR_NUMBER&gt;:
&lt;WHY&gt;"</programlisting>
+
+        <para>Where:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><literal> <replaceable>&lt;PROJECT&gt;</replaceable>
+            </literal>is usually
+            <literal>incubator-freemarker</literal></para>
+          </listitem>
+
+          <listitem>
+            <para><literal> <replaceable>&lt;PR_NUMBER&gt;</replaceable>
+            </literal>is the pull request number that GitHub shows prominently
+            after a <quote>#</quote></para>
+          </listitem>
+
+          <listitem>
+            <para><literal> <replaceable>&lt;WHY&gt;</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>
 


Mime
View raw message