From mboxrd@z Thu Jan 1 00:00:00 1970 From: suvayu ali Subject: Re: New feature branch: org-xhtml-and-org-odt Date: Mon, 14 Nov 2011 21:28:20 +0100 Message-ID: References: <81lirjdsu3.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([140.186.70.92]:46812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ391-0004dQ-HO for emacs-orgmode@gnu.org; Mon, 14 Nov 2011 15:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQ390-0004Dg-FS for emacs-orgmode@gnu.org; Mon, 14 Nov 2011 15:28:43 -0500 Received: from mail-bw0-f41.google.com ([209.85.214.41]:48260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ390-0004Db-4u for emacs-orgmode@gnu.org; Mon, 14 Nov 2011 15:28:42 -0500 Received: by bke17 with SMTP id 17so6228633bke.0 for ; Mon, 14 Nov 2011 12:28:41 -0800 (PST) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Matt Price Cc: bzg@altern.org, emacs-orgmode@gnu.org, Jambunathan K Hi Matt, On Mon, Nov 14, 2011 at 21:06, Matt Price wrote: > hmm, what are the pul instructions for this? sorry, my git-fu is pretty > basic: I tried > git pull origin/org-xhtml-and-org-odt > and > git pull org-xhtml-and-org-odt With master checked out (git checkout master), do the following: $ git pull $ git checkout -b origin/org-xhtml-and-org-odt Now you are on the branch which tracks origin/org-xhtml-and-org-odt. Now you can compile, experiment whatever. When you have had enough fun, to get back to master do the following: $ git checkout master Any subsequent updates to the branch from Jambunathan will be pulled in automatically when you do `git pull' in the future. However your local branch tracking origin/org-xhtml-and-org-odt will not be updated. To do that do the following: $ git checkout $ git pull -f The `-f' is there to deal with situations when Jambunathan rebases his branch on top of the latest master (this is common practice for topic branches). Hope this helps. -- Suvayu Open source is the future. It sets us free.