From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Makefile restructuring Date: Tue, 08 Nov 2011 22:23:30 +0100 Message-ID: <87fwhyux4d.fsf@Rainer.invalid> References: <87k4bqwkyw.fsf@gnu.org> <87sjqejvob.fsf@Rainer.invalid> <87k4bqjnwu.fsf@Rainer.invalid> <87fwmdkind.fsf@Rainer.invalid> <874o2t81qu.fsf@gnu.org> <87liw43iys.fsf@Rainer.invalid> <8762n8d4ys.fsf@gnu.org> <87ei1u6u3q.fsf_-_@Rainer.invalid> <87hb6i3z1l.fsf@Rainer.invalid> <87k47av6j2.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:46048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNt91-0008HP-0U for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 16:23:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNt8z-0007az-RO for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 16:23:46 -0500 Received: from lo.gmane.org ([80.91.229.12]:33568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNt8z-0007at-MM for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 16:23:45 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RNt8y-0003M7-GK for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 22:23:44 +0100 Received: from p57aacb4a.dip.t-dialin.net ([87.170.203.74]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 08 Nov 2011 22:23:44 +0100 Received: from Stromeko by p57aacb4a.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 08 Nov 2011 22:23:44 +0100 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: emacs-orgmode@gnu.org Achim Gratz writes: > A more complete recipe for setting up a tracking branch to a remote > branch in git (assuming you've already cloned orgmode.git locally and > have a clean working directory): ...which doesn't really work since I did a few experiments in the clone and messed up the recipe by not checking the already existing configuration. So when you get the error message at step 4 you can salvage it with: $ git remote update $ git branch --set-upstream local-Makefile remote-tableheadings/Makefile $ git config branch.local-Makefile.rebase true In a fresh clone that does not have pre-existing definitions and configurations, this would be the right thing to do (and is a bit shorter): $ git remote add -t Makefile remote-tableheadings git://repo.or.cz/org-mode/org-tableheadings.git $ git remote update $ git branch --track local-Makefile remote-tableheadings/Makefile $ git config branch.local-Makefile.rebase true $ git checkout local-Makefile I tested it on a completely fresh clone this time. :-) Sorry for the confusion Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for KORG EX-800 and Poly-800MkII V0.9: http://Synth.Stromeko.net/Downloads.html#KorgSDada