{"thread":{"id":"17000","subject":"git documentation","startedAt":"2009-01-06T01:07:09Z","lastAt":"2009-01-06T01:46:56Z","messageCount":3,"participants":["david@lang.hm","Jakub Narebski","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"99397","messageId":"m33afxb5tw.fsf@localhost.localdomain","threadId":"17000","inReplyTo":"alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm","subject":"Re: git documentation","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-01-06T01:07:09Z","receivedAt":"2009-01-06T01:07:09Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"David Lang <david@lang.hm> writes:\n\n> On lwn there is a comment (under the GNOME survey topic)\n> http://lwn.net/Articles/313435/\n> \n> The Shlomi Fish \"Better SCM\" site for example is very clear that Git\n> won't do a merge across a rename. It even has a citation for this\n> claim. But as a Git user who has actually done a merge across a rename\n> I know it works just fine, and anyone familiar with Git's internals\n> will guess immediately why. Yet probably there is no line of\n> documentation on the Git site or elsewhere that I can quote to justify\n> adding a \"Yes\" to the comparison.\n\nI have tried to add info about Git to Better SCM quite a long time\nago; it was finally added by (IIRC) Alexey Mahotkin for\nhttp://versioncontrolblog.com and sent for inclusion in Better SCM to\nShlomi Fish.\n\nUnfortunately it contains some factual errors. I have sent corrections\nto Alexey, but didn't finish it:\n  \"Git at Better SCM Initiative comparison of VCS (long)\"\n  http://article.gmane.org/gmane.comp.version-control.git/97253\n(see also other posts in this thread, and other posts with the same,\nor similar, subject on git mailing list).\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"99399","messageId":"20090106014622.GA21154@genesis.frugalware.org","threadId":"17000","inReplyTo":"alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm","subject":"Re: git documentation","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2009-01-06T01:46:22Z","receivedAt":"2009-01-06T01:46:22Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Jan 05, 2009 at 05:46:56PM -0800, david@lang.hm wrote:\n> why. Yet probably there is no line of documentation on the Git site or \n> elsewhere that I can quote to justify adding a \"Yes\" to the comparison.\n\nI think it's documented in Documentation/merge-strategies.txt, under the\n'recursive' merge strategy:\n\n\"Additionally this can detect and handle merges involving renames.\"\n"},{"id":"99392","messageId":"alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm","threadId":"17000","inReplyTo":null,"subject":"git documentation","fromName":"","fromEmail":"david@lang.hm","sentAt":"2009-01-06T01:46:56Z","receivedAt":"2009-01-06T01:46:56Z","isPatch":false,"sender":{"key":"david@lang.hm","avatar":null},"body":"on lwn there is a comment (under the GNOME survey topic)\nhttp://lwn.net/Articles/313435/\n\nThe Shlomi Fish \"Better SCM\" site for example is very clear that Git won't \ndo a merge across a rename. It even has a citation for this claim. But as \na Git user who has actually done a merge across a rename I know it works \njust fine, and anyone familiar with Git's internals will guess immediately \nwhy. Yet probably there is no line of documentation on the Git site or \nelsewhere that I can quote to justify adding a \"Yes\" to the comparison.\n\n\nsounds like a missing piece of documentation that someone should be able \nto fill in fairly easily.\n\nDavid Lang\n"}]}