procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/automerge: Disable rebasing.

Browse source
This commit is contained in:
Glenn Morris 2018-01-24 14:44:39 -05:00
parent 96de0503cd
commit 686c83a473
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
admin/automerge
View file

@ -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..."