Re: combined diff does not detect binary files and ignores -diff attribute

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: combined diff does not detect binary files and ignores -diff attribute
From: Jay Soffian <jaysoffian@xxxxxxxxx>
Date: Tue, 24 May 2011 12:52:01 -0400
Cc: Junio C Hamano <gitster@xxxxxxxxx>, Jeff King <peff@xxxxxxxx>, git <git@xxxxxxxxxxxxxxx>
In-reply-to: <4DDBDF0C.2040708@xxxxxxxxxxxxxxxxxxxx>

On Tue, May 24, 2011 at 12:38 PM, Michael J Gruber
<git@xxxxxxxxxxxxxxxxxxxx> wrote:
> Well, it seemed that Jay wanted an external tool for merge diffs.

Only because I wasn't using textconv, but I should have been.

j.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

References:
- combined diff does not detect binary files and ignores -diff attribute
  - From: Jay Soffian
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Michael J Gruber
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Jay Soffian
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Jeff King
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Jeff King
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Jay Soffian
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Jeff King
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Junio C Hamano
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Michael J Gruber
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Junio C Hamano
- Re: combined diff does not detect binary files and ignores -diff attribute
  - From: Michael J Gruber

Prev by Date: Re: commit a1f6baa5 (wrap long header lines) breaks my habit
Next by Date: Re: [PATCH] checkout: honor advice.detachedHead when reattaching to a branch
Previous by thread: Re: combined diff does not detect binary files and ignores -diff attribute
Next by thread: Re: combined diff does not detect binary files and ignores -diff attribute
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]