diff --git a/cli/src/main/java/org/openjdk/skara/cli/GitPr.java b/cli/src/main/java/org/openjdk/skara/cli/GitPr.java
index 7a48ead80..bb24c01ee 100644
--- a/cli/src/main/java/org/openjdk/skara/cli/GitPr.java
+++ b/cli/src/main/java/org/openjdk/skara/cli/GitPr.java
@@ -79,6 +79,9 @@ public static void main(String[] args) throws Exception {
                     Command.name("reviewer")
                            .helptext("add or remove reviewers")
                            .main(GitPrReviewer::main),
+                    Command.name("summary")
+                           .helptext("add a summary to the commit message for the pull request")
+                           .main(GitPrSummary::main),
                     Command.name("cc")
                            .helptext("add one or more labels")
                            .main(GitPrCC::main)
diff --git a/cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSummary.java b/cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSummary.java
new file mode 100644
index 000000000..a5b6c4757
--- /dev/null
+++ b/cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSummary.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.cli.pr;
+
+import org.openjdk.skara.args.*;
+
+import static org.openjdk.skara.cli.pr.Utils.*;
+
+import java.io.IOException;
+import java.util.List;
+import java.nio.file.Files;
+
+public class GitPrSummary {
+    static final List<Flag> flags = List.of(
+        Switch.shortcut("")
+              .fullname("remove")
+              .helptext("Remove an existing summary")
+              .optional(),
+        Switch.shortcut("")
+              .fullname("verbose")
+              .helptext("Turn on verbose output")
+              .optional(),
+        Switch.shortcut("")
+              .fullname("debug")
+              .helptext("Turn on debugging output")
+              .optional(),
+        Switch.shortcut("")
+              .fullname("version")
+              .helptext("Print the version of this tool")
+              .optional()
+    );
+
+    static final List<Input> inputs = List.of(
+        Input.position(0)
+             .describe("ID")
+             .singular()
+             .optional()
+    );
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        var parser = new ArgumentParser("git-pr summary", flags, inputs);
+        var arguments = parse(parser, args);
+        var repo = getRepo();
+        var uri = getURI(repo, arguments);
+        var host = getForge(uri, repo, arguments);
+        var id = pullRequestIdArgument(repo, arguments);
+        var pr = getPullRequest(uri, repo, host, id);
+
+        if (arguments.contains("remove")) {
+            showReply(awaitReplyTo(pr, pr.addComment("/summary")));
+            return;
+        }
+
+        var file = Files.createTempFile("SUMMARY", ".txt");
+        var success = spawnEditor(repo, file);
+        if (!success) {
+            System.err.println("error: editor exited with non-zero status code, aborting");
+            System.exit(1);
+        }
+        var lines = Files.readAllLines(file);
+        if (lines.stream().allMatch(String::isEmpty)) {
+            System.err.println("error: no summary present, aborting");
+            System.exit(1);
+        }
+        var comment = lines.size() == 1 ?
+            pr.addComment("/summary " + lines.get(0)) :
+            pr.addComment("/summary\n" + String.join("\n", lines));
+        showReply(awaitReplyTo(pr, comment));
+    }
+}