From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luben Tuikov Subject: Re: git pull on Linux/ACPI release tree Date: Sun, 8 Jan 2006 13:20:57 -0800 (PST) Message-ID: <20060108212057.79825.qmail@web31815.mail.mud.yahoo.com> References: Reply-To: ltuikov@yahoo.com Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: "Brown, Len" , "David S. Miller" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@osdl.org, git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 08 22:21:12 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 1EvhyN-0001pB-Nh for gcvg-git@gmane.org; Sun, 08 Jan 2006 22:21:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161203AbWAHVVD (ORCPT ); Sun, 8 Jan 2006 16:21:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161206AbWAHVVB (ORCPT ); Sun, 8 Jan 2006 16:21:01 -0500 Received: from web31815.mail.mud.yahoo.com ([68.142.206.168]:55971 "HELO web31815.mail.mud.yahoo.com") by vger.kernel.org with SMTP id S1161203AbWAHVVA (ORCPT ); Sun, 8 Jan 2006 16:21:00 -0500 Received: (qmail 79827 invoked by uid 60001); 8 Jan 2006 21:20:57 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=YKo7OshAB3SFS2M9+kEMqIpSmYviFSU+XFZnyU4lcAMZSrQnBQ7e8PZY5zcyBLR0hBWLkjaAsj1ZhhVMkFQ0qeJa3R8VkrLjCwdsZSF8DTvb8NmLZj3K1Bs+/YAq3Mi4sxb6XkALJKtP0dnqUJgVpABfooVBMRFUNPHZPzRw8z8= ; Received: from [68.221.39.133] by web31815.mail.mud.yahoo.com via HTTP; Sun, 08 Jan 2006 13:20:57 PST To: Linus Torvalds , Martin Langhoff In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --- Linus Torvalds wrote: > So trying out git-rebase and git-cherry-pick just in case you decide to > want to use them might be worthwhile. Making it part of your daily routine > like David has done? Somewhat questionable, but hey, it seems to be > working for David, and it does make some things much easier, so.. How about this usage (branch == tree): Tree A (your tree) Tree B (project B, dependent on Tree A) Tree C (project C, dependent on project B) (i.e. diff(C-A) = diff(C-B) + diff(B-A)) Your tree is pulled into Tree A as often as your tree changes and it just fast forwards. If I want to run project B with your latest tree, then I resolve/merge from tree A to tree B, compile B and run it. If I want to run project C and project B with your latest tree, I resolve/merge from tree A to tree B and from tree B to tree C, compile C and run it. In such cases, are you saying that you'd prefer to pull from Tree B and Tree C (depending on your needs)? Another question: Sometimes, a fix for project B finds its way into tree C (project C) (since C depended on that fix in B). Now I'd like to pull that particular fix, identified by its SHA, into project B, and nothing else, for this I can use git-cherry-pick, right? And lastly, is there a tool whereby I can "see" changes between repos, kind of like git-diff but being able to give URLs too? Luben