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: Andreas Schwab
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 11:36:23 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

martin rudalics <address@hidden> writes:

> Neither do
>
> git show 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa
> git show cb4e054e41cdb7e398351a5ae8224759e721349e

Try git show -m to see both sides.  A diff for a merge commit by default
only shows changes that differ from both sides.

Andreas.

-- 
Andreas Schwab, SUSE Labs, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."



reply via email to

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