aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorJoakim Verona2015-02-01 00:37:46 +0100
committerJoakim Verona2015-02-01 00:37:46 +0100
commit69815dfe3704f8a8c733843f1fd04546cbb0f4d0 (patch)
treecee6910753a51b9a5ee88e2431c9bcad099e8ba8 /admin
parent4edad429cafb2f0b1fda028be58367286ab04f1c (diff)
parenta2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e (diff)
downloademacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.tar.gz
emacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.zip
Merge branch 'master' into xwidget
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rwxr-xr-xadmin/update_autogen2
2 files changed, 5 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e692ca0dbfd..ec500569860 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12015-01-28 Glenn Morris <rgm@gnu.org>
2
3 * update_autogen (commit): Prepend "# " to commit message.
4
12015-01-24 Paul Eggert <eggert@cs.ucla.edu> 52015-01-24 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix a couple of AM_V_GEN bugs 7 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 ()
228 228
229 echo "Committing..." 229 echo "Committing..."
230 230
231 $vcs commit -m "Auto-commit of $type files." "$@" || return $? 231 $vcs commit -m "# Auto-commit of $type files." "$@" || return $?
232 232
233 [ "$vcs" = "git" ] && { 233 [ "$vcs" = "git" ] && {
234 $vcs push || return $? 234 $vcs push || return $?