Re: [Gnumed-devel] jl-gui et alii

[Karsten Hilbert]

On Tue, Aug 20, 2013 at 06:52:33AM +0200, Jerzy Luszawski wrote:

> > I see that you've published quite some code on gitorious
> > which is both impressive and really nice to see.
> The number of commits is misleading.
> I'm not sure if I do it right, but the only way I found to keep my
> repository up-to-date with origin/master is to pull from origin/master
> locally and then push to private-clone/master. I did not find any way
> to pull directly from the side of private-clone.
> Generally, I tried to create topic branches with commits related to
> particular topic, and jl-gui as my trunk with merged everything. It
> may be easier to look at the branches and cherry-pick only some
> commits for upstream.
> I'm not very familiar with git, which is very flexible, so sometimes the
> history of commits is not as clear as I would like it to be. :)

Yeah, it is so flexible as to be confusing at times. I find
this useful:

        http://book.git-scm.com/

also this, despite I don't follow it:

        http://nvie.com/posts/a-successful-git-branching-model/

Karsten
-- 
GPG key ID E4071346 @ gpg-keyserver.de
E167 67FD A291 2BEA 73BD  4537 78B9 A9F9 E407 1346