From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Costalba Subject: Re: The merge from hell... Date: Thu, 2 Feb 2006 08:25:40 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: Junio C Hamano , Git Mailing List , Paul Mackerras , Marco Costalba , Aneesh Kumar X-From: git-owner@vger.kernel.org Thu Feb 02 08:25:46 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 1F4Yqe-00032J-Un for gcvg-git@gmane.org; Thu, 02 Feb 2006 08:25:45 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423344AbWBBHZm (ORCPT ); Thu, 2 Feb 2006 02:25:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423345AbWBBHZm (ORCPT ); Thu, 2 Feb 2006 02:25:42 -0500 Received: from zproxy.gmail.com ([64.233.162.204]:21485 "EHLO zproxy.gmail.com") by vger.kernel.org with ESMTP id S1423344AbWBBHZl convert rfc822-to-8bit (ORCPT ); Thu, 2 Feb 2006 02:25:41 -0500 Received: by zproxy.gmail.com with SMTP id 34so333194nzf for ; Wed, 01 Feb 2006 23:25:41 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Z9XtL7TLBCZm4bWtEgvkqrAWRzTLqWrEvGAc19pT9ATTmQ10rR8LEwt9eGbYUS6RlCsiddIYb8DYxyP1ocEUDMugyVc2HJQ1kb1c5WilSCMYyOljs4CcQdZ8ME8lV6kVdv4WiT3mm9v5D4i+iXe4KvQG2C6LQRVz1eRTZdZvaPU= Received: by 10.65.192.11 with SMTP id u11mr186655qbp; Wed, 01 Feb 2006 23:25:40 -0800 (PST) Received: by 10.64.131.15 with HTTP; Wed, 1 Feb 2006 23:25:40 -0800 (PST) To: Linus Torvalds In-Reply-To: Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On 2/2/06, Linus Torvalds wrote: > > Btw, I think you're better off parsing the "git-diff-tree --cc" output > than doing it yourself like gitk does, now that core git has support for > things like that. > Currently the public git repo version of qgit uses "git-diff-tree -c" for merges, It's not a problem to change qgit to use --cc option instead. But I would like to use just one kind of option to filter merges files. So I would like to hear some feedback on using --cc vs -c. Marco