From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: Re: Creating diffs Date: Thu, 03 Aug 2006 16:47:49 +0200 Organization: At home Message-ID: References: <20060803122937.GI5016@robert.daprodeges.fqdn.th-h.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit X-From: git-owner@vger.kernel.org Thu Aug 03 16:48:22 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1G8eUf-0005P8-5v for gcvg-git@gmane.org; Thu, 03 Aug 2006 16:48:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932523AbWHCOsG (ORCPT ); Thu, 3 Aug 2006 10:48:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932510AbWHCOsF (ORCPT ); Thu, 3 Aug 2006 10:48:05 -0400 Received: from main.gmane.org ([80.91.229.2]:60291 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S932473AbWHCOsE (ORCPT ); Thu, 3 Aug 2006 10:48:04 -0400 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1G8eUH-0005J4-M5 for git@vger.kernel.org; Thu, 03 Aug 2006 16:47:49 +0200 Received: from host-81-190-31-92.torun.mm.pl ([81.190.31.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 03 Aug 2006 16:47:49 +0200 Received: from jnareb by host-81-190-31-92.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 03 Aug 2006 16:47:49 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: git@vger.kernel.org X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-31-92.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Jakub Narebski wrote: > Rocco Rutte wrote: > >> However, when I do: >> >> $ git diff source:file dest:file >> >> I get: >> >> --- a/source:file >> +++ b/source:file >> >> But I'd like to drop the branchname. Can I do that without filtering >> everything through sed(1)? > > If I remember correctly there were two patches which solved it > differently: > > one gave > > --- a/source:file > +++ b/dest:file > > second (and I guess it is better solution) > > --- a/file > +++ b/file > > Unfortunately they seem unapplied... The patches are: http://www.gelato.unsw.edu.au/archives/git/0607/24325.html http://www.gelato.unsw.edu.au/archives/git/0607/24326.html -- Jakub Narebski Warsaw, Poland ShadeHawk on #git