Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Date: Sat, 13 Dec 2014 15:13:25 +0100
> 
> Never rebase commits that are upstream. Rebasing will always create new
> commits (in case if you wondering, 'pull --rebase=preserve' doesn't
> change that; it will keep a merge commit, but that will not merge
> origin/emacs-24 anymore but a new set of commits).

English, please: what does that mean?  The documentation seems to
suggest that "pull --rebase=preserve" is exactly the right thing in
this situation.

> Instead, simply merge master into your tree. Despite what others may
> say, this is still a perfectly valid thing to do in Git. :-) This what
> 'git pull' will do by default (unless you configured it otherwise).

Yes, but then my commits will appear as merge-commits, won't they?