From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 11:36:23 +0100 Message-ID: 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 X-Trace: ger.gmane.org 1458643008 29463 80.91.229.3 (22 Mar 2016 10:36:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 10:36:48 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , Paul Eggert , emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 11:36:35 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 1aiJfv-0002iH-85 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 11:36:35 +0100 Original-Received: from localhost ([::1]:34919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJfu-0000HI-Ia for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 06:36:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJfr-0000Gf-4n for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:36:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiJfq-0007Li-Ch for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:36:31 -0400 Original-Received: from mx2.suse.de ([195.135.220.15]:53267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJfl-0007JF-Kg; Tue, 22 Mar 2016 06:36:25 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DB0F8AB5D; Tue, 22 Mar 2016 10:36:23 +0000 (UTC) X-Yow: .. ich bin in einem dusenjet ins jahr 53 vor chr... ich lande im antiken Rom... einige gladiatoren spielen scrabble... ich rieche PIZZA... In-Reply-To: <56F11CC8.4000406@gmx.at> (martin rudalics's message of "Tue, 22 Mar 2016 11:22:00 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:202059 Archived-At: martin rudalics 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, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."