From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 11:58:36 +0100 Message-ID: <56F1255C.7090301@gmx.at> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <56EFBD68.1050307@gmx.at> <56F0358F.7000103@cs.ucla.edu> <56F11CC8.4000406@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458644363 19300 80.91.229.3 (22 Mar 2016 10:59:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 10:59:23 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , Paul Eggert , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 11:59:13 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiK1m-0006nc-A2 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 11:59:10 +0100 Original-Received: from localhost ([::1]:35300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiK1l-0006Wv-Mm for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 06:59:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiK1g-0006WK-O2 for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:59:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiK1b-0000ak-MK for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:59:04 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:58670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiK1b-0000aE-Cj; Tue, 22 Mar 2016 06:58:59 -0400 Original-Received: from [192.168.1.100] ([212.95.7.15]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MJSLz-1ako3y1QNP-0031t6; Tue, 22 Mar 2016 11:58:45 +0100 In-Reply-To: X-Provags-ID: V03:K0:3oj60YhCPCDeeImQOlAauzdPTe24y2WbgXeQNf5oO1nmew98p3P CeLV4N6YQqG+sGyBlWCycKr1gKoy9+Jk+16P1UstG2wO3DMdGb3uzZmLn43YTj2RghQYiuv Zehge5hs/Hl9d65tw0by0WUl+TgsPlQGNChcbNqXaZY0qhSJUig1WTXwP4dX8OVABInq3lJ +OSJ/IWp3ZNdBy53i4Vyg== X-UI-Out-Filterresults: notjunk:1;V01:K0:xqSpDXZCogQ=:R5vZtA66Ye6Tnkp9cn3dOZ TNt6UCFymbtKxH0zWwzblLMunRs7ILGOGuivrcc+J3pRi/GDVwKfaAW4169LYT9pGoqM/p9Y+ xgsWOYze20k/sgwgV5vQqeIYkSJlmf1RtCTknqoLUsgN32pOmlFL2hCth1MZ3Ksq91cbRvWGD zYfvkB1I/nvox4OoEPBqqCdqeN3hiv9OBMuAHl2a38MLS+AufRK7ne/bdruGhGT6QWJKA90KP tjjHe9GwfZGZBLonFAo9QE2pmCvUvS7Mvn/JMFX+DjcpVNBlytwB0MWiUGj00sWvOIuWJdhT0 8wiz7Mor5o4EeN9YJMFeWXeyqVU8yynwdB0HSsv3fOutASbWfnP1ZO/E8OdU+nJsqp8Vs/EcQ o077dz5HM0u2H7xcNB7524UADaPfFBP75w7OSja3mkYpXhBoCunxJ50f5yk8wWtTPyYao4cGK yk1bt26dsd0FDDvhKrKV49MNcFk2NkrQhhdw50ydxxHAEKfwv2hSy9rEfKVaTjTfozy7U0eeF FHhVpOTeQY1VVQUvqKyugjd3bR+vnhkwoteUzZyLlVcUD15+hjECb99yqp9zsvQlhr8qC5xHT OiS6RvEGYhaNef8gOaW8Bqh3QKb/GPOeYhmjiPPCCkdE6BPc5Y2/zqI3McskbiR5m2FbzrSun uS43lnErGVB2/9p795EZjoZNDN2HZEO3qRaQ00/bfEFL69SOj5Gz8DBboJXsA785ulrJFgurF 9Y0tXNmI4NF7VD8Z+AmFVVBit+sJNv8zuCoM1eLwVkxic0PIlCGSrBtfyXCGaLn2rwHGFZ24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.19 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202060 Archived-At: >> 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. Thanks, this seems to show it. But git show -m 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa gets me some 500.000 lines of output. Is there a way to restrict that to src/window.c? martin