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

[David Engster]

Ted Zlatanov writes:
> On Sat, 13 Dec 2014 10:50:13 +0100 David Engster <address@hidden> wrote: 
>
> DE> David Engster writes:
>>> Ted Zlatanov writes:
>>>> On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii <address@hidden> wrote: 
>>>> 
> EZ> No need to fear, just remember to review what "git show" displays,
> EZ> after the merge and before you push.  If it doesn't look OK to you,
> EZ> you can always reset to cancel the merge.
>>>> 
>>>> Yup.  I did it, carefully.
>>> 
>>> I'm afraid something went wrong. You did not actually merge.
>>> 
>>> Could it be that you somehow rebased before pushing (by doing 'pull
>>> --rebase', for instance)?
>
> I don't think so? Now I'm just perplexed, too. I must have rebased the
> commit accidentally. I *started* to rebase because a commit came in
> before I pushed.

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).

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).

> But I aborted the rebase, then redid the merge.

Yes, it seems there was a pending commit when you finished the merge, so
it was all squashed into one. When you want to start from scratch, the
best thing to do is a hard reset on 'origin/master'. This will make sure
you're in the same state as upstream.

In any case, as much as I like Emacs, I really recommend to use 'gitk
--all' to inspect your tree before pushing. This will show you
immediately if you have created a proper merge from origin/emacs-24.

> I'm sorry about this,

Don't be.

> I'll get it right next time.

That's the spirit.

-David