Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261618AbVDUW7G (ORCPT ); Thu, 21 Apr 2005 18:59:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261573AbVDUW7G (ORCPT ); Thu, 21 Apr 2005 18:59:06 -0400 Received: from w241.dkm.cz ([62.24.88.241]:42122 "HELO machine.sinus.cz") by vger.kernel.org with SMTP id S261606AbVDUW66 (ORCPT ); Thu, 21 Apr 2005 18:58:58 -0400 Date: Fri, 22 Apr 2005 00:58:57 +0200 From: Petr Baudis To: Linus Torvalds Cc: tony.luck@intel.com, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, git@vger.kernel.org Subject: Re: ia64 git pull Message-ID: <20050421225857.GB1474@pasky.ji.cz> References: <200504212042.j3LKgng04318@unix-os.sc.intel.com> <200504212155.j3LLtho04949@unix-os.sc.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-message-flag: Outlook : A program to spread viri, but it can do mail too. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1441 Lines: 33 Dear diary, on Fri, Apr 22, 2005 at 12:29:07AM CEST, I got a letter where Linus Torvalds told me that... > On Thu, 21 Apr 2005 tony.luck@intel.com wrote: > > > > I can't quite see how to manage multiple "heads" in git. I notice that in > > your tree on kernel.org that .git/HEAD is a symlink to heads/master ... > > perhaps that is a clue. > > It's mainly a clue to bad practice, in my opinion. I personally like the > "one repository, one head" approach, and if you want multiple heads you > just do multiple repositories (and you can then mix just the object > database - set your SHA1_FILE_DIRECTORY environment variable to point to > the shared object database, and you're good to go). There are two points regarding this: (i) You need to track heads of remote branches anyway. (ii) I want an easy way for user to refer to head of another working tree on the same repository (so that you can do just git merge testing). This is why the multiple heads are there, and it's actually everything they _do_. There's nothing more behind it. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/