From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Tom Clarke" Subject: Re: [PATCH] Adding rebase merge strategy Date: Fri, 28 Sep 2007 19:18:15 +0200 Message-ID: <550f9510709281018h4197d942k9dcbcfbb657d1329@mail.gmail.com> References: <11909961212172-git-send-email-tom@u2i.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: gitster@pobox.com, git@vger.kernel.org To: "Johannes Schindelin" X-From: git-owner@vger.kernel.org Fri Sep 28 19:18:31 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IbJTv-0001SV-L7 for gcvg-git-2@gmane.org; Fri, 28 Sep 2007 19:18:28 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753106AbXI1RST (ORCPT ); Fri, 28 Sep 2007 13:18:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753048AbXI1RSS (ORCPT ); Fri, 28 Sep 2007 13:18:18 -0400 Received: from py-out-1112.google.com ([64.233.166.180]:41142 "EHLO py-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752322AbXI1RSS (ORCPT ); Fri, 28 Sep 2007 13:18:18 -0400 Received: by py-out-1112.google.com with SMTP id u77so5369861pyb for ; Fri, 28 Sep 2007 10:18:17 -0700 (PDT) Received: by 10.35.106.15 with SMTP id i15mr3837614pym.1190999896116; Fri, 28 Sep 2007 10:18:16 -0700 (PDT) Received: by 10.35.86.2 with HTTP; Fri, 28 Sep 2007 10:18:15 -0700 (PDT) In-Reply-To: Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On 9/28/07, Johannes Schindelin wrote: > > +# Copyright (c) 2005 Linus Torvalds > > Really? Well 90% of the file was copy and pasted from one of the other merge strategies which was indeed written by Linus. So it seemed appropriate. If that's not appropriate attribution I can remove :-). -Tom