From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: Org-mode development workflow with Git
Date: Thu, 13 Jan 2011 18:45:57 +0100 [thread overview]
Message-ID: <87lj2oy9wq.fsf@Rainer.invalid> (raw)
In-Reply-To: 87pqs1aj7b.fsf@riotblast.dunsmor.com
Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:
> I'd be interested to hear about other workflows or how mine might be
> improved.
I'd say whatever works for you works. :-)
I've set up all but one of my various git clones up to rebase by default
instead of merging when doing a pull. That way I can float my local
changes to the top of the tracking branch(es) whenever I pull them up to
the latest version and never lose sight of them. So far it's been
working well with pure git commands (ocassionally I will have to reset a
branch and/or cherry-pick something into order, but gitk ensures that I
don't goof on this too badly).
When you have more of these, something like topgit or stgit may provide
an easier UI and cut down on manual interventions. I've tried stgit
with the org repository and decided not to use it in the end; also it
needs python which becomes problematic in some installations. As far as
I can tell topgit works well, but it is geared towards a somewhat
different workflow than I've adopted. If you happen to follow that flow
it might be just the tool for you.
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
prev parent reply other threads:[~2011-01-13 17:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-12 21:46 Org-mode development workflow with Git Jason Dunsmore
2011-01-13 0:54 ` Tommy Stanton
2011-01-13 17:45 ` Achim Gratz [this message]
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=87lj2oy9wq.fsf@Rainer.invalid \
--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).