Merge from origin/emacs-24

e13e3bd * admin/update_autogen (commit): Prepend "# " to commit message.

2 files changed, 5 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index e692ca0dbfd..6cc59c47d06 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-03  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen (commit): Prepend "# " to commit message.
+
 2015-01-24  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix a couple of AM_V_GEN bugs
diff --git a/admin/update_autogen b/admin/update_autogen
index 1a84030a5b0..73e8aebe3d8 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -228,7 +228,7 @@ commit ()
 
     echo "Committing..."
 
-    $vcs commit -m "Auto-commit of $type files." "$@" || return $?
+    $vcs commit -m "# Auto-commit of $type files." "$@" || return $?
 
     [ "$vcs" = "git" ] && {
         $vcs push || return $?