I am using Google Inbox to write emails. I apologize for the email format as I don't know what I can do to fix this. This is what it looks like to me when I am writing the email: http://i.imgur.com/oYhaTHg.pn
I just followed your instructions of your other mail to rebase to
emacs-25, but Daniels changes are not there.
His changes seem only to be in emacs-master. (I am sorry I am not very
familiar with git, for my personal stuff I use hg and I use even the
git-hg plugin to maintain matlab, but I don't dare to do that for
So just rebase to the master branch using the below.
git fetch --all
git checkout master
git reset --hard origin/master