{"thread":{"id":"35282","subject":"Splitting files merge with branches","startedAt":"2013-11-05T09:38:45Z","lastAt":"2013-11-05T19:19:53Z","messageCount":2,"participants":["Javier Domingo","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"230113","messageId":"CALZVapmJDEWyUcgdJ0C0V0bKpSyukHZ=ei9GgVh-Z0yfb8x8tQ@mail.gmail.com","threadId":"35282","inReplyTo":null,"subject":"Splitting files merge with branches","fromName":"Javier Domingo","fromEmail":"javierdo1@gmail.com","sentAt":"2013-11-05T09:38:45Z","receivedAt":"2013-11-05T09:38:45Z","isPatch":false,"sender":{"key":"javierdo1@gmail.com","avatar":"https://gravatar.com/avatar/0f43d4d2e5f4320e8b5e1a46914213c5459dd0de261ab1587f222827f863d727?d=mp&s=160"},"body":"Hi,\n\nI have been using git for now 4 years, and one feature I miss a lot,\nthat would increase the usability of git in many cases, would be\nhaving it detect \"inter-file\" movements, so that if I, in a single\ncommit just part one file into many, git can track that change.\n\nI suppose this is quite difficult, as would mean having extra features\nin diffs, and I don't know how could it be implemented, but that would\nease even more having integration branches, and merging one with\neachother.\n\nI wouldn't either know how to split it, in the means that if 5 lines\nare in the middle of a split, where would those lines go? But as you\nhave resolved quite variety of problems, you might now a way.\n\nJust wanted to collaborate with my idea =)\n\nCheers,\n\nJavier Domingo Cansino\n"},{"id":"230124","messageId":"xmqq8ux2ac6e.fsf@gitster.dls.corp.google.com","threadId":"35282","inReplyTo":"CALZVapmJDEWyUcgdJ0C0V0bKpSyukHZ=ei9GgVh-Z0yfb8x8tQ@mail.gmail.com","subject":"Re: Splitting files merge with branches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-11-05T19:19:53Z","receivedAt":"2013-11-05T19:19:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Javier Domingo <javierdo1@gmail.com> writes:\n\n> I have been using git for now 4 years, and one feature I miss a lot,\n> that would increase the usability of git in many cases, would be\n> having it detect \"inter-file\" movements, so that if I, in a single\n> commit just part one file into many, git can track that change.\n>\n> I suppose this is quite difficult, as would mean having extra features\n> in diffs, and I don't know how could it be implemented,...\n\nSounds like $gmane/217 to me.\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/27/focus=217\n\nSome of the pieces that are needed to immplement the \"drilling down\"\nLinus envisioned in the message are already there, e.g. you can ask\n\"log -S<block of text> -1\" to find the last commit that touched the\nblock of text in question.  Once you find that commit, you can\ninspect \"git show -m -p <that-commit>\" and find \"Ahh, that block of\ntext that appeared in the new tree came from five copies of similar\nblocks of text in the old tree\".  Nobody wrote that last piece of\nthe logic yet, though.\n"}]}