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

[Eli Zaretskii]

> From: Dmitry Gutov <address@hidden>
> Cc: David Engster <address@hidden>,  address@hidden
> Date: Sun, 14 Dec 2014 00:00:15 +0200
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> When you rebase a commit, it becomes a new one. Therefore, you can only
> >> safely rebase "local" commits (meaning: commits only *you* have).
> >
> > If "safely" here means "while preserving the commit's sha1", then it's
> > quite obvious.
> 
> Rebasing *never* preserves a commit's SHA.  So basically, you always get
> a set of new commits that look very much like the old ones.

That's what I said.

> > at all, even when rebase=preserve was/is used?
> 
> What rebase=preserve does, is "pass --preserve-merges along to git
> rebase so that locally created merge commits will not be flattened"
> (quoting the 'git pull' man page).

That's what I said.

Thanks.