[Emacs-diffs] master 686c83a: * admin/automerge: Disable rebasing.

[Glenn Morris]

branch: master
commit 686c83a473e4b235caac018aa0b61a5aad7c6a5b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/automerge: Disable rebasing.
---
 admin/automerge | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/automerge b/admin/automerge
index d96974c..54ac88d 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..."