From: Achim Gratz <Stromeko@NexGo.DE>
To: emacs-orgmode@gnu.org
Subject: Re: using local.mk to maintain a local git branch
Date: Mon, 26 Nov 2012 11:25:45 +0000 (UTC) [thread overview]
Message-ID: <loom.20121126T121029-343@post.gmane.org> (raw)
In-Reply-To: 87mwy5qfia.fsf@ericabrahamsen.net
Eric Abrahamsen <eric <at> 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.
next prev parent reply other threads:[~2012-11-26 11:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 2:12 using local.mk to maintain a local git branch Eric Abrahamsen
2012-11-26 11:25 ` Achim Gratz [this message]
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=loom.20121126T121029-343@post.gmane.org \
--to=stromeko@nexgo.de \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).