From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Sixt Subject: Re: [PATCH 1/2] Allow git-apply to fix up the line counts Date: Thu, 05 Jun 2008 17:07:15 +0200 Message-ID: <48480123.7030903@viscovery.net> References: <4847CCD9.6000305@viscovery.net> <4847EBC3.8060509@viscovery.net> <4847F49F.8090004@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, gitster@pobox.com To: Johannes Schindelin X-From: git-owner@vger.kernel.org Thu Jun 05 17:08:41 2008 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 1K4H4X-00023M-B8 for gcvg-git-2@gmane.org; Thu, 05 Jun 2008 17:08:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754886AbYFEPHT (ORCPT ); Thu, 5 Jun 2008 11:07:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754361AbYFEPHT (ORCPT ); Thu, 5 Jun 2008 11:07:19 -0400 Received: from lilzmailso02.liwest.at ([212.33.55.13]:20319 "EHLO lilzmailso02.liwest.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753129AbYFEPHS (ORCPT ); Thu, 5 Jun 2008 11:07:18 -0400 Received: from cm56-163-160.liwest.at ([86.56.163.160] helo=linz.eudaptics.com) by lilzmailso02.liwest.at with esmtpa (Exim 4.66) (envelope-from ) id 1K4H3b-0007VT-Ld; Thu, 05 Jun 2008 17:07:16 +0200 Received: from [127.0.0.1] (J6T.linz.viscovery [192.168.1.42]) by linz.eudaptics.com (Postfix) with ESMTP id 698A66B7; Thu, 5 Jun 2008 17:07:15 +0200 (CEST) User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) In-Reply-To: X-Enigmail-Version: 0.95.5 X-Spam-Score: 0.2 (/) X-Spam-Report: ALL_TRUSTED=-1.8, BAYES_80=2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Johannes Schindelin schrieb: > So how about --ignore-hunk-headers? I think this is much more > descriptive, and catches your complaint, IMHO. Yes, that's good as well. :-) -- Hannes