[Emacs-diffs] master 0b2014f 03/19: Merge from origin/emacs-24

[Fabián Ezequiel Gallina]

branch: master
commit 0b2014f9cb13efdd6ebc30627d88b9a7f3a42149
Merge: 4fc35ed e13e3bd
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>

    Merge from origin/emacs-24
    
    e13e3bd * admin/update_autogen (commit): Prepend "# " to commit message.
---
 admin/ChangeLog      |    4 ++++
 admin/update_autogen |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/admin/ChangeLog b/admin/ChangeLog
index e692ca0..6cc59c4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-03  Glenn Morris  <address@hidden>
+
+       * update_autogen (commit): Prepend "# " to commit message.
+
 2015-01-24  Paul Eggert  <address@hidden>
 
        Fix a couple of AM_V_GEN bugs
diff --git a/admin/update_autogen b/admin/update_autogen
index 1a84030..73e8aeb 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 $?