From: Greg Troxel <email@example.com>
To: Peter Davis <firstname.lastname@example.org>
Subject: Re: Keeping up to date
Date: Tue, 29 Apr 2014 12:44:26 -0400 [thread overview]
Message-ID: <email@example.com> (raw)
In-Reply-To: <20140429161623.GA72660@pdavismbp15.iscinternal.com> (Peter Davis's message of "Tue, 29 Apr 2014 12:16:23 -0400")
[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]
Peter Davis <firstname.lastname@example.org> writes:
> A while ago, I switched from ELPA to Git as my Org-mode
> source. However, I now have three Macs I'm trying to keep in sync, and
> doing Git updates is definitely more labor intensive. Any suggestions
> for good ways to keep three machines all up-to-date with Emacs and
I use git to obtain org mode. For me, the tricky part is choosing which
branch and when to update. Actually doing "git update" is easy. So
set "core.logallrefupdates = true" on all git repos
on a well-connected server machine, clone the official repo, and
on other machines, clone the first.
when you want to update, create a tag 'stable-yyyymmdd' on the main
machine. update and ff-merge to the latest maint. Test.
If you have issues, git reset --hard stable-yyyymmdd.
If you're happy, git remote update/merge (pull) on the others.
That's basically what I do. I find the real work is resolving any issues
From the update and deciding if it's safe. I used to follow master, not
maint, so it was probably scarier there.
> I suppose the best thing would be to put all my emacs stuff in a
> Dropbox folder and run from that, but I haven't managed to overcome
> the inertia to get that working.
Do you mean your .org files or the sources for org? I don't see how git
is unsuitable for the "get sources" part. I use it for .org files too
(separate repo of course), and have a script to autocommit/push every
morning on the main machine I edit on. One could use a distributed
filesystem instead; I haven't tried the owncloud client (and wouldn't
want to put any bits with confidentiality needs on dropbox).
[-- Attachment #2: Type: application/pgp-signature, Size: 180 bytes --]
next prev parent reply other threads:[~2014-04-29 16:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 16:16 Keeping up to date Peter Davis
2014-04-29 16:44 ` Greg Troxel [this message]
2014-04-29 16:45 ` John Hendy
2014-04-29 18:27 ` Peter Davis
2014-04-29 20:34 ` John Hendy
2014-04-29 23:12 ` Grant Rettke
2014-04-30 17:51 ` "Clément B."
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:
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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
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).