From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Urlichs Subject: Re: The coolest merge EVER! Date: Fri, 24 Jun 2005 13:54:52 +0200 Organization: {M:U} IT Consulting Message-ID: References: <7v64w4d1n6.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-From: git-owner@vger.kernel.org Fri Jun 24 13:54:01 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Dlmkj-0005bq-Bs for gcvg-git@gmane.org; Fri, 24 Jun 2005 13:53:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263277AbVFXL7N (ORCPT ); Fri, 24 Jun 2005 07:59:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263273AbVFXL7D (ORCPT ); Fri, 24 Jun 2005 07:59:03 -0400 Received: from main.gmane.org ([80.91.229.2]:62633 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S263275AbVFXLzH (ORCPT ); Fri, 24 Jun 2005 07:55:07 -0400 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Dlmfb-0004Q3-N6 for git@vger.kernel.org; Fri, 24 Jun 2005 13:48:28 +0200 Received: from run.smurf.noris.de ([192.109.102.41]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 24 Jun 2005 13:48:27 +0200 Received: from smurf by run.smurf.noris.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 24 Jun 2005 13:48:27 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: git@vger.kernel.org X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: run.smurf.noris.de User-Agent: Pan/0.14.2.91 (As She Crawled Across the Table) X-Face: '&-&kxR\8+Pqalw@VzN\p?]]eIYwRDxvrwEM I suspect there > would be a massive additional support needed if you want to make it easy > for Paul to pull changes made to gitk in your tree. I don't think that's possible; after all, the trees are now merged, so any pull would fetch all of Linus' tree. Paul could do it as patches, or Linus could do it in a branch, or we could write something entirely different from git that happens to support cherrypicking. ;-) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - What's so funny 'bout peace, love, and understanding?