From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-33774-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 17812 invoked by alias); 23 Nov 2014 18:12:29 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 33774
Received: (qmail 24599 invoked from network); 23 Nov 2014 18:12:26 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham
	version=3.3.2
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :cc:content-type:content-transfer-encoding;
        bh=trhZ8ozI9rBbTcYdLHxvd37z7gJZFK8GOIVNBoQCs+I=;
        b=FkSgQvozu4ZV6MYZVdwkKYtTG8k3AnoTjCyPUIcejdrzGZ+BpTgmbmi7TzfW3SxFXd
         TiAwxl80bqahmbz3ShdtF1can65X8vpSTI1AGrOUaA6R9cxFSS3LA0VZbmeepT+eH+mM
         A+PV6RR8wXsTc0U1mt3/PMamWo5VIXnM57V7aa8FuC1BnD+aNnbtPJmQgWxiAkHb92v2
         AvfPOsOumyp7Bze8Dv5K8YixI11TZd/rFrQbSazC7pBxA4xn8pz5xq6ukTDtRdyBQTwr
         hAU8I2Etwwa/4ixgwGzkQQqgcjJZtTDtToAnJ4IS5LmKfFig0D1PZrmCMm7cH3UV0SpW
         EccQ==
MIME-Version: 1.0
X-Received: by 10.50.131.199 with SMTP id oo7mr7943867igb.42.1416766341714;
 Sun, 23 Nov 2014 10:12:21 -0800 (PST)
In-Reply-To: <547209BD.4070605@eastlink.ca>
References: <930.1416260160@thecus.kiddle.eu>
	<42F4E5F2-97E7-4803-87CB-B1C67CD943B2@kba.biglobe.ne.jp>
	<15511.1416528068@thecus.kiddle.eu>
	<546E9224.7090709@eastlink.ca>
	<CAHYJk3Tca_aAn5mjtGb24DDeor28Jk+M9aBYLQhC__Y5-BubUQ@mail.gmail.com>
	<546EA58F.7010101@eastlink.ca>
	<141120222353.ZM10495@torch.brasslantern.com>
	<546F7646.7080108@eastlink.ca>
	<141121204545.ZM11623@torch.brasslantern.com>
	<141121214351.ZM12585@torch.brasslantern.com>
	<5470BE8D.5030009@eastlink.ca>
	<089E69C3-7394-4EB6-A321-D542D881C60E@macports.org>
	<547209BD.4070605@eastlink.ca>
Date: Sun, 23 Nov 2014 19:12:21 +0100
Message-ID: <CAHYJk3R7kW7avPk6W+2Zi9p8Yxn-C2RVFLs98JrvUiPQTAQqVA@mail.gmail.com>
Subject: Re: trouble with debugging binary
From: Mikael Magnusson <mikachu@gmail.com>
To: Ray Andrews <rayandrews@eastlink.ca>
Cc: zsh workers <zsh-workers@zsh.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Sun, Nov 23, 2014 at 5:22 PM, Ray Andrews <rayandrews@eastlink.ca> wrote=
:
> On 11/22/2014 11:58 PM, Lawrence Vel=C3=A1zquez wrote:
>>
>> On Nov 22, 2014, at 11:49 AM, Ray Andrews <rayandrews@eastlink.ca> wrote=
:
>
> Lawrence,
>
>>    The "unified" format is quite common. I personally have a hard time
>> reading diffs in other formats.
>> https://en.wikipedia.org/wiki/Diff_utility#Unified_format vq
>
> Thanks, that is very informative.  I never looked at the switches for
> 'diff'.  So this means that we can patch the output from 'git diff' then =
so
> long as we have the whole file?  It will be interesting to see, at the ne=
xt
> 'pull' if git recognizes the patch or complains.

If you think "git pull" downloads patches and applies them locally,
you are completely mistaken :). As a sidenote, you can produce patches
with git that 'patch' cannot apply, if you specify -M and/or -C. 'git
am' or 'git apply' are always able to apply these though, of course.

I'm actually a bit confused about what you consider the 'normal' diff
format, almost nobody uses anything other than the unified format.

--=20
Mikael Magnusson