From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Makefile restructuring Date: Tue, 08 Nov 2011 19:00:17 +0100 Message-ID: <87k47av6j2.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> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:41296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNpyO-0002R9-HB for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 13:00:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNpyM-0002tR-RO for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 13:00:36 -0500 Received: from lo.gmane.org ([80.91.229.12]:60436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNpyM-0002tM-Lg for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 13:00:34 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RNpyJ-0004NZ-CZ for emacs-orgmode@gnu.org; Tue, 08 Nov 2011 19:00:31 +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 19:00:31 +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 19:00:31 +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 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): $ git remote add -t Makefile remote-tableheadings git://repo.or.cz/org-mode/org-tableheadings.git $ git fetch remote-tableheadings Makefile:local-Makefile $ git checkout local-Makefile $ git branch --track local-Makefile remote-tableheadings/Makefile $ git config branch.local-Makefile.rebase true Whenever you want to get changes from upstream, do a $ git pull When you just want to check if there are changes, do a $ git remote update $ git status HTH, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds