Quoting Hauke Lathus <h...@pansensack.de> from ml.softs.gtk-gnutella.devel: :Please take a look at gtk-gnutella's graph with a graphical history :browser such as gitk (which is part of Git's main distribution). You :will notice what an (unnecessarily) complex graph you created in the :first half of 2011-09-06, and that's what caused the noise.
This happened because I had 4 xterm windows openend and my shell was in different git reposotories (sandboxes), which I did not notice at first. Since I did not want to redo stuff by hand in the proper sandbox, I locally committed and then pulled stuff from each sandbox, to be able to get a coherent state. It was also a way for me to play with the tool to see how it went, to "get a feeling". Maybe the history rewriting features of git can re-linearize the commits. What I find confusing (i.e. not well-explaind in the man pages) is the difference between "merge", "rebase", "reset". Well "merge" and "rebase" I think I understand the difference, but "reset" is still a mystery. It will take time for me to learn all this and find my own way of using git, i.e. know what is working best for me and fits my work organization. When I have more experience, I'll read stuff on the web about different ways of using git. For now, this is just too confusing as I have little time to devote to actually learning git, as opposed to performing the 0.97.1 release soon, which means extra development still. I know enough for now to use it to check in and push stuff. Raphael ------------------------------------------------------------------------------ Using storage to extend the benefits of virtualization and iSCSI Virtualization increases hardware utilization and delivers a new level of agility. Learn what those decisions are and how to modernize your storage and backup environments for virtualization. http://www.accelacomm.com/jaw/sfnl/114/51434361/ _______________________________________________ gtk-gnutella-devel mailing list gtk-gnutella-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtk-gnutella-devel
