On Wednesday 07 September 2011, Raphael Manfredi wrote: > This happened because I had 4 xterm windows openend
I didn't mean to offend :-) > Maybe the history rewriting features of git can re-linearize the > commits. Tool-wise, it is easy. The problem is: Once you pushed something out to the public, it is hard to take back, because it is already on other people's workstations, and you can't force them to accept your "faked" history. Rewriting public history (in Git just as in real life) requires a conspiracy. > 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. Reset sticks your current branch pointer to an already-existing commit, while merge and rebase create new ones to stick the pointer to. > 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. Of course, developing gtk-gnutella is what this is all about. I'm looking forward to the 0.97.1 release :-) Bye, Hauke ------------------------------------------------------------------------------ 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
