From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: using local.mk to maintain a local git branch Date: Mon, 26 Nov 2012 11:25:45 +0000 (UTC) Message-ID: References: <87mwy5qfia.fsf@ericabrahamsen.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:54786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcwpH-0004Yg-LI for emacs-orgmode@gnu.org; Mon, 26 Nov 2012 06:26:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcwpB-0004rY-UF for emacs-orgmode@gnu.org; Mon, 26 Nov 2012 06:26:11 -0500 Received: from plane.gmane.org ([80.91.229.3]:36018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcwpB-0004rT-ND for emacs-orgmode@gnu.org; Mon, 26 Nov 2012 06:26:05 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TcwpG-0002Ns-20 for emacs-orgmode@gnu.org; Mon, 26 Nov 2012 12:26:10 +0100 Received: from 217.10.60.85 ([217.10.60.85]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Nov 2012 12:26:10 +0100 Received: from Stromeko by 217.10.60.85 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Nov 2012 12:26:10 +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 Eric Abrahamsen ericabrahamsen.net> writes: > 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. That's true insofar as you don't need to keep a local branch just for adjusting the Makefile to your environment anymore, which was what my original posting (where the content in this note was copied from) originally was about. If you keep a local branch anyway for other changes to Org, then you could still configure it for rebasing if you prefer it over merging. > 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--- This would work (I think, haven't tested it), but if your local branch has origin/master directly as its upstream and optionally set it up to rebase rather than merge, then you don't need to do anything like that in local.mk. I.e. you'd have the following config for branch local: ---8<--- [branch "local"] remote = origin merge = refs/heads/master rebase = true --->8--- > If this is right, maybe we can add an extra line or two of explanation > to the FAQ? Could you be more specific what you think should be altered or added? Regards, Achim.