[Emacs-diffs] master 1b598d3: * admin/update_autogen (commit): Pull before push.

[Glenn Morris]

branch: master
commit 1b598d32aa06128fb5d9faa634118360e68a73c7
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/update_autogen (commit): Pull before push.
---
 admin/update_autogen | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/update_autogen b/admin/update_autogen
index 898432e..9393ab0 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -237,6 +237,8 @@ commit ()
     $vcs commit -m "; Auto-commit of $type files." "$@" || return $?
 
     [ "$vcs" = "git" ] && {
+        ## In case someone else pushed something while we were working.
+        $vcs pull --rebase || return $?
         $vcs push || return $?
     }