emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Eric Abrahamsen <eric@ericabrahamsen.net>
To: emacs-orgmode@gnu.org
Subject: using local.mk to maintain a local git branch
Date: Mon, 26 Nov 2012 10:12:13 +0800	[thread overview]
Message-ID: <87mwy5qfia.fsf@ericabrahamsen.net> (raw)

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

next             reply	other threads:[~2012-11-26  2:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26  2:12 Eric Abrahamsen [this message]
2012-11-26 11:25 ` using local.mk to maintain a local git branch Achim Gratz
2012-11-26 14:26   ` Eric Abrahamsen
2012-11-27 21:05     ` Achim Gratz
2012-11-28  3:05       ` Eric Abrahamsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mwy5qfia.fsf@ericabrahamsen.net \
    --to=eric@ericabrahamsen.net \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).