From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Abrahamsen Subject: using local.mk to maintain a local git branch Date: Mon, 26 Nov 2012 10:12:13 +0800 Message-ID: <87mwy5qfia.fsf@ericabrahamsen.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:46148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tco7Q-0005mh-Dy for emacs-orgmode@gnu.org; Sun, 25 Nov 2012 21:08:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tco7P-0002h5-Im for emacs-orgmode@gnu.org; Sun, 25 Nov 2012 21:08:20 -0500 Received: from plane.gmane.org ([80.91.229.3]:49583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tco7P-0002gz-CR for emacs-orgmode@gnu.org; Sun, 25 Nov 2012 21:08:19 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Tco7Y-0000dx-Gv for emacs-orgmode@gnu.org; Mon, 26 Nov 2012 03:08:28 +0100 Received: from 114.250.111.164 ([114.250.111.164]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Nov 2012 03:08:28 +0100 Received: from eric by 114.250.111.164 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Nov 2012 03:08:28 +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 In the Org FAQ, under the "How can I keep local changes..." section, there's a note saying that the config local:rebase options are no longer needed under the new make system, and something equivalent can be done using local.mk configurations. I'm not terribly conversant with Makefiles, but is the following correct? Given that I have a local branch called "local", and like "up1" as my standard make target, my understanding is that "make myup" will perform the up1 installation, then execute my rebase command. --8<---------------cut here---------------start------------->8--- oldorg: up1 # Update from git, build, check, but don't install up1 myup:: git rebase master local --8<---------------cut here---------------end--------------->8--- If this is right, maybe we can add an extra line or two of explanation to the FAQ? Thanks, Eric