* Org-mode development workflow with Git
@ 2011-01-12 21:46 Jason Dunsmore
2011-01-13 0:54 ` Tommy Stanton
2011-01-13 17:45 ` Achim Gratz
0 siblings, 2 replies; 3+ messages in thread
From: Jason Dunsmore @ 2011-01-12 21:46 UTC (permalink / raw)
To: Org-mode mailing list
Hello,
I've been trying to fix more of the Org-mode issues I come across. This
led me to a particular Git workflow that I documented on my blog:
http://blog.dunsmor.com/2011/01/keeping-a-private-development-branch-in-git-using-multiple-remotes/
I'd be interested to hear about other workflows or how mine might be
improved.
Regards,
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Org-mode development workflow with Git
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
1 sibling, 0 replies; 3+ messages in thread
From: Tommy Stanton @ 2011-01-13 0:54 UTC (permalink / raw)
To: Jason Dunsmore; +Cc: Org-mode mailing list
Hey Jason,
Thanks for the link; I was just recently curious about how others
work with Git in this way, creating a private branch to make fixes on.
Excellent!
-Tommy
On Wed, Jan 12, 2011 at 1:46 PM, Jason Dunsmore
<emacs-orgmode@dunsmor.com> wrote:
> Hello,
>
> I've been trying to fix more of the Org-mode issues I come across. This
> led me to a particular Git workflow that I documented on my blog:
>
> http://blog.dunsmor.com/2011/01/keeping-a-private-development-branch-in-git-using-multiple-remotes/
>
> I'd be interested to hear about other workflows or how mine might be
> improved.
>
> Regards,
> Jason
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Org-mode development workflow with Git
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
1 sibling, 0 replies; 3+ messages in thread
From: Achim Gratz @ 2011-01-13 17:45 UTC (permalink / raw)
To: emacs-orgmode
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-13 17:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).