emacs-devel
[Top][All Lists]
Advanced

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

Re: Missing changes in merges from emacs-25 to master


From: David Engster
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Fri, 25 Mar 2016 17:27:38 +0100
User-agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/25.0.50 (gnu/linux)

My proofreader is on holiday...

David Engster writes:
> Well, the cherry-picked commit ad879b7 is now in master's history. The
> patch of that diff shows that it changes those lines.
                ^^^^ commit

[...]

> I forgot how it worked in Bazaar. Did a merge commit hold the full patch
> information of all merged commits? In any case, that's now the case for
                                                         ^^^ not

> Git: a merge commit is a normal commit, simply with more than one
> parent.


-David



reply via email to

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