From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Org-mode development workflow with Git Date: Thu, 13 Jan 2011 18:45:57 +0100 Message-ID: <87lj2oy9wq.fsf@Rainer.invalid> References: <87pqs1aj7b.fsf@riotblast.dunsmor.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=39451 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdRQO-0006ag-CF for emacs-orgmode@gnu.org; Thu, 13 Jan 2011 12:57:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdRFX-0003S5-Vi for emacs-orgmode@gnu.org; Thu, 13 Jan 2011 12:46:16 -0500 Received: from lo.gmane.org ([80.91.229.12]:43991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdRFX-0003Rt-Q2 for emacs-orgmode@gnu.org; Thu, 13 Jan 2011 12:46:15 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PdRFR-0005ig-8b for emacs-orgmode@gnu.org; Thu, 13 Jan 2011 18:46:09 +0100 Received: from p57aab13f.dip.t-dialin.net ([87.170.177.63]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Jan 2011 18:46:09 +0100 Received: from Stromeko by p57aab13f.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Jan 2011 18:46:09 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Jason Dunsmore 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