From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: [PATCH] Clean up the description of org-archive-location Date: Tue, 02 Dec 2008 08:24:49 -0500 Message-ID: <871vwqd80u.fsf@gollum.intra.norang.ca> References: <878wrf1x7v.fsf@fastmail.fm> <8984.1227114553@alphaville.usa.hp.com> <877i6zzl41.fsf_-_@gollum.intra.norang.ca> <8A25DB21-DB8F-43A9-8659-682103E9F97B@uva.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L7VFO-0000os-Sf for emacs-orgmode@gnu.org; Tue, 02 Dec 2008 08:25:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L7VFN-0000oL-Si for emacs-orgmode@gnu.org; Tue, 02 Dec 2008 08:25:02 -0500 Received: from [199.232.76.173] (port=48850 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7VFN-0000oH-LH for emacs-orgmode@gnu.org; Tue, 02 Dec 2008 08:25:01 -0500 Received: from mho-02-bos.mailhop.org ([63.208.196.179]:63409) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L7VFN-0007Rg-8q for emacs-orgmode@gnu.org; Tue, 02 Dec 2008 08:25:01 -0500 In-Reply-To: (Christian Egli's message of "Tue\, 02 Dec 2008 13\:48\:10 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Christian Egli Cc: emacs-orgmode@gnu.org Christian Egli writes: > Hi > > Carsten Dominik writes: > >> I think I am ripe for a little lecture about remote repositories >> and tracking them, so that I do not need to type the location of >> your repo each time... :-) > > Can't you just do > > git remote add bernt git://git.norang.ca/org-mode > > and then > > git fetch bernt > > At least that's my take if I read the section `Fetching' of > http://www.gnome.org/~federico/news-2008-11.html#pushing-and-pulling-with-git-1. > Yes. (sorry I sent a reply to this off-list originally) NOTE: The branches in my repository are temporary and rewritten for future work after they have been included or rejected by Carsten so you may not always find a 'for-carsten' branch in that repo. This also means you can't track the 'for-carsten' branch locally in your repository since it gets rewritten with rebase. git remote add bernt git://git.norang.ca/org-mode will add a remote named 'bernt' which you can fetch from. When you fetch a branch using git fetch bernt for-carsten it creates the missing objects in your repository and points a temporary reference FETCH_HEAD at that branch. > Unfortunatelly there is no explanation on how to merge the Bernt's > changes: > > "In the next part, we'll see how to merge Larry's changes into > ours, and how to monitor his work to pull from it regularly." You can view it compared to your master branch with gitk master FETCH_HEAD and you're free to cherry-pick commits from it. If you want to change things you can create a branch there with git checkout -b temp FETCH_HEAD then you can rebase that based on other things etc. Applying changes from my repo matches the git format-patch and git am workflow (which is normally how one deals with patches from the mailing list) if you do this: (this assumes no conflicts and creates linear history) git fetch bernt for-carsten git checkout -b temp FETCH_HEAD git rebase master git checkout master git merge temp git branch -D temp HTH, Bernt