diff options
author | Glenn Morris <rgm@gnu.org> | 2018-01-24 14:44:39 -0500 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-01-24 14:44:39 -0500 |
commit | 686c83a473e4b235caac018aa0b61a5aad7c6a5b (patch) | |
tree | 9749be082b8ed88061b067bf3a88782788d609f0 /admin/automerge | |
parent | 96de0503cd04f3cba7c4db94789b958e9775e2c6 (diff) | |
download | emacs-686c83a473e4b235caac018aa0b61a5aad7c6a5b.tar.gz |
* admin/automerge: Disable rebasing.
Diffstat (limited to 'admin/automerge')
-rwxr-xr-x | admin/automerge | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/admin/automerge b/admin/automerge index d96974ca562..54ac88db4ff 100755 --- a/admin/automerge +++ b/admin/automerge @@ -181,10 +181,13 @@ echo "Tests finished ok" ## In case someone else pushed while we were working. -echo "Checking for remote changes..." -git fetch || die "fetch error" +#echo "Checking for remote changes..." +#git fetch || die "fetch error" +## NB If there were remote changes, this would rewrite the release +## branch commits, which is not what we want. +## Ref eg http://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html ## git >= 1.8.5 has "pull --rebase=preserve" -git rebase --preserve-merges || die "rebase error" +#git rebase --preserve-merges || die "rebase error" echo "Pushing..." |