From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gianluca Pacchiella Subject: Checkout of orphan branch files into mainline worktree Date: Thu, 25 Mar 2010 11:39:42 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Mar 25 11:45:14 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NukYr-0006OD-Fk for gcvg-git-2@lo.gmane.org; Thu, 25 Mar 2010 11:45:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812Ab0CYKpG (ORCPT ); Thu, 25 Mar 2010 06:45:06 -0400 Received: from lo.gmane.org ([80.91.229.12]:56836 "EHLO lo.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570Ab0CYKpE (ORCPT ); Thu, 25 Mar 2010 06:45:04 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NukYg-0006Kv-TC for git@vger.kernel.org; Thu, 25 Mar 2010 11:45:02 +0100 Received: from 151.59.101.45 ([151.59.101.45]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 25 Mar 2010 11:45:02 +0100 Received: from gianluca.pacchiella by 151.59.101.45 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 25 Mar 2010 11:45:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 151.59.101.45 User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi folks, I have a repository where I maintain a project for a web site with a branch (disconnected from the mainline history) that contains some files (necessary only for a particular instance of a site) that don't intersect with others files in the main project. Since I don't want to use submodule and subtree I manage myself to this sequence of commands ("deploy" is the branch name of the mainline history and "index" of the --orphan branch) to checkout the index's files into the mainline files git read-tree index && ( git ls-files --with-tree=index | git checkout-index --stdin ) && git read-tree deploy Are there some other ways to do this? I'm crazy? are there side effects? Thanks, Gianluca