diff options
| author | Glenn Morris | 2017-05-17 12:44:29 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-05-17 12:44:29 -0400 |
| commit | 1b598d32aa06128fb5d9faa634118360e68a73c7 (patch) | |
| tree | b0e88a7f2bd02cfdf4b464ad73d543b1a30fc4b9 /admin/update_autogen | |
| parent | df4e105910a983f42e77828809ab50611b454905 (diff) | |
| download | emacs-1b598d32aa06128fb5d9faa634118360e68a73c7.tar.gz emacs-1b598d32aa06128fb5d9faa634118360e68a73c7.zip | |
* admin/update_autogen (commit): Pull before push.
Diffstat (limited to 'admin/update_autogen')
| -rwxr-xr-x | admin/update_autogen | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/update_autogen b/admin/update_autogen index 898432eae60..9393ab0ee90 100755 --- a/admin/update_autogen +++ b/admin/update_autogen | |||
| @@ -237,6 +237,8 @@ commit () | |||
| 237 | $vcs commit -m "; Auto-commit of $type files." "$@" || return $? | 237 | $vcs commit -m "; Auto-commit of $type files." "$@" || return $? |
| 238 | 238 | ||
| 239 | [ "$vcs" = "git" ] && { | 239 | [ "$vcs" = "git" ] && { |
| 240 | ## In case someone else pushed something while we were working. | ||
| 241 | $vcs pull --rebase || return $? | ||
| 240 | $vcs push || return $? | 242 | $vcs push || return $? |
| 241 | } | 243 | } |
| 242 | 244 | ||