Re: [leaf-devel] Git workflow questions

2014-02-11 Thread KP Kirchdörfer
Hi David; Am Montag, 10. Februar 2014, 20:00:16 schrieb David M Brooke: > Hi kp, > > Thanks for the responses. > > On Sat, 2014-02-08 at 00:13 +0100, KP Kirchdörfer wrote: > > Hi David; > > > > Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke: > > > Hi leaf-devel, > > > > > > I've

Re: [leaf-devel] Git workflow questions

2014-02-11 Thread Yves Blusseau
Le 10 févr. 2014 à 21:00, David M Brooke a écrit : >>> I also have a new Package (vnstat) which I'd like to add. That's not a >>> bug-fix, so should I create my feature branch off "master" rather than >>> "maint"? >> Fork off the new feature branch from maint if you want to add the new package

Re: [leaf-devel] Git workflow questions

2014-02-11 Thread Yves Blusseau
Le 7 févr. 2014 à 22:09, David M Brooke a écrit : > Hi leaf-devel, > Hi David ! > What I did was: > - Created a new local branch (called "trac#93") based on "maint" > - Committed the code change against that new branch > - Merged the bugfix branch back into « maint" (with "--no-ff") You

Re: [leaf-devel] Git workflow questions

2014-02-10 Thread David M Brooke
Hi kp, Thanks for the responses. On Sat, 2014-02-08 at 00:13 +0100, KP Kirchdörfer wrote: > Hi David; > > Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke: > > Hi leaf-devel, > > > > I've been busy with other things for a while and I haven't had much time > > for LEAF development. H

Re: [leaf-devel] Git workflow questions

2014-02-07 Thread KP Kirchdörfer
Hi David; Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke: > Hi leaf-devel, > > I've been busy with other things for a while and I haven't had much time > for LEAF development. However there are a couple of new projects I'm > doing with LEAF and some of the work is of general interes

[leaf-devel] Git workflow questions

2014-02-07 Thread David M Brooke
Hi leaf-devel, I've been busy with other things for a while and I haven't had much time for LEAF development. However there are a couple of new projects I'm doing with LEAF and some of the work is of general interest (though some of it probably isn't!). Since I last did much LEAF development I un