From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81183 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.gnus.general Subject: Re: Git support question part XXIV Date: Thu, 02 Feb 2012 11:38:57 +0100 Message-ID: References: <8762fp4jiq.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328179190 15248 80.91.229.3 (2 Feb 2012 10:39:50 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 2 Feb 2012 10:39:50 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29464@lists.math.uh.edu Thu Feb 02 11:39:47 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rsu4x-0007SG-NU for ding-account@gmane.org; Thu, 02 Feb 2012 11:39:47 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1Rsu4X-00049N-Pk; Thu, 02 Feb 2012 04:39:21 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1Rsu4W-000496-23 for ding@lists.math.uh.edu; Thu, 02 Feb 2012 04:39:20 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1Rsu4H-0000yb-Uk for ding@lists.math.uh.edu; Thu, 02 Feb 2012 04:39:19 -0600 Original-Received: from mail-out.m-online.net ([212.18.0.9]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Rsu4G-0004uW-7k for ding@gnus.org; Thu, 02 Feb 2012 11:39:04 +0100 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 0C4191C0C0F8 for ; Thu, 2 Feb 2012 11:38:58 +0100 (CET) X-Auth-Info: vAHgFzYtzV4cM7RqIQZMu/NDdI0aN+hU/9JGDZ/aE0k= Original-Received: from igel.home (ppp-93-104-155-81.dynamic.mnet-online.de [93.104.155.81]) by mail.mnet-online.de (Postfix) with ESMTPA id 7B4EE1C0007D for ; Thu, 2 Feb 2012 11:38:58 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id E5610CA29F; Thu, 2 Feb 2012 11:38:57 +0100 (CET) X-Yow: What UNIVERSE is this, please?? In-Reply-To: <8762fp4jiq.fsf@gnus.org> (Lars Ingebrigtsen's message of "Thu, 02 Feb 2012 11:27:57 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81183 Archived-At: Lars Ingebrigtsen writes: > It seems like the ChangeLog "diff" gets longer and longer and longer the > more I merge. But the bogus lines start with " +" instead of "+", so > it's not really a diff, either. So I'm wondering what it's doing, and > whether I'm doing anything wrong. See git-diff(1), section COMBINED DIFF FORMAT for the description of the format. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."