emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: EWW bugs should be fixed on emacs-25 branch


From: John Wiegley
Subject: Re: EWW bugs should be fixed on emacs-25 branch
Date: Fri, 25 Dec 2015 08:58:31 -0800
User-agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin)

>>>>> Eli Zaretskii <address@hidden> writes:

>> That way, we need not rely on manual additions to the commit message.
> Actually, I was talking about what git-merge.el does.

I'm wondering then if git-merge.el is doing the wrong thing. I'll need to take
a deeper look at it to see if that is the case.

In general, Git handles "not duplicating work you've cherry-picked into a
branch" quite well.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2



reply via email to

[Prev in Thread] Current Thread [Next in Thread]