Accept the default message when there are no conflicts.

jaraco · Sep 30, 2022 · 0d67782 · 0d67782
1 parent b2240be
commit 0d67782
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,8 @@
+v7.14.0
+=======
+
+* ``update-projects`` no longer prompts to edit the commit message.
+
 v7.13.1
 =======
 

diff --git a/jaraco/develop/update-projects.py b/jaraco/develop/update-projects.py
@@ -31,7 +31,7 @@ def update_project(name):
     with temp_checkout(name):
         if not is_skeleton():
             return
-        proc = subprocess.Popen(['git', 'pull', 'gh://jaraco/skeleton'])
+        proc = subprocess.Popen(['git', 'pull', 'gh://jaraco/skeleton', '--no-edit'])
         code = proc.wait()
         if code:
             subprocess.check_call(['git', 'mergetool'])