From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joshua Jensen Subject: Re: [PATCH] optionally disable overwriting of ignored files Date: Fri, 20 Aug 2010 13:01:22 -0600 Message-ID: <4C6ED102.2040002@workspacewhiz.com> References: <4C6A1C5B.4030304@workspacewhiz.com> <7viq39avay.fsf@alter.siamese.dyndns.org> <20100818233900.GA27531@localhost> <20100820184838.GA8861@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Jakub Narebski , Junio C Hamano , "git@vger.kernel.org" To: Clemens Buchacher X-From: git-owner@vger.kernel.org Fri Aug 20 21:01:46 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OmWqX-0007T7-CR for gcvg-git-2@lo.gmane.org; Fri, 20 Aug 2010 21:01:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752900Ab0HTTBY (ORCPT ); Fri, 20 Aug 2010 15:01:24 -0400 Received: from hsmail.qwknetllc.com ([208.71.137.138]:56524 "EHLO hsmail.qwknetllc.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753156Ab0HTTBX (ORCPT ); Fri, 20 Aug 2010 15:01:23 -0400 Received: (qmail 3773 invoked by uid 399); 20 Aug 2010 13:01:22 -0600 Received: from unknown (HELO ?192.168.1.2?) (jjensen@workspacewhiz.com@75.220.172.102) by hsmail.qwknetllc.com with ESMTPAM; 20 Aug 2010 13:01:22 -0600 X-Originating-IP: 75.220.172.102 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.8) Gecko/20100802 Lightning/1.0b2 Thunderbird/3.1.2 In-Reply-To: <20100820184838.GA8861@localhost> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: ----- Original Message ----- From: Clemens Buchacher Date: 8/20/2010 12:48 PM > On Thu, Aug 19, 2010 at 03:41:08AM -0700, Jakub Narebski wrote: >> You forgot to update Documentation/git-checkout.txt and >> Documentation/git-merge.txt with the new '-i' option. > Thanks. I am just waiting for some kind of feedback. I'm not going > to write documentation for something that won't get accepted. I like the idea... :) My vote doesn't count, though... Josh