From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Lord <lord@emf.net>
Subject: Re: Merge with git-pasky II.
Date: Tue, 26 Apr 2005 13:30:04 -0700 (PDT)
Message-ID: <200504262030.NAA21304@emf.net>
References: <Pine.LNX.4.58.0504261256150.18901@ppc970.osdl.org>
Cc: bram@bitconjurer.org, git@vger.kernel.org
X-From: git-owner@vger.kernel.org Tue Apr 26 22:26:18 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([12.107.209.244])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1DQWd7-0001cI-Jn
	for gcvg-git@gmane.org; Tue, 26 Apr 2005 22:26:01 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S261614AbVDZUa2 (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Tue, 26 Apr 2005 16:30:28 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261616AbVDZUa2
	(ORCPT <rfc822;git-outgoing>); Tue, 26 Apr 2005 16:30:28 -0400
Received: from emf.emf.net ([205.149.0.19]:62986 "EHLO emf.net")
	by vger.kernel.org with ESMTP id S261614AbVDZUaQ (ORCPT
	<rfc822;git@vger.kernel.org>); Tue, 26 Apr 2005 16:30:16 -0400
Received: (from lord@localhost) by emf.net (K/K) id NAA21304; Tue, 26 Apr 2005 13:30:04 -0700 (PDT)
To: torvalds@osdl.org
In-reply-to: <Pine.LNX.4.58.0504261256150.18901@ppc970.osdl.org> (message from Linus Torvalds on Tue, 26 Apr 2005 12:58:18 -0700 (PDT))
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org



   From: Linus Torvalds <torvalds@osdl.org>

   On Tue, 26 Apr 2005, Bram Cohen wrote:
   > 
   > If one person renames a file and another person modifies it then the
   > changes should be applied to the moved file.

   Bzzt. Wrong answer.

You're a little bit nuts, guy.

-t