{"thread":{"id":"26929","subject":"RFC: script to manually associate files after failed rename detection in conflicting merge","startedAt":"2011-03-30T13:38:37Z","lastAt":"2011-03-30T13:38:37Z","messageCount":1,"participants":["Tilman Vogel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"164689","messageId":"4D93325D.70403@web.de","threadId":"26929","inReplyTo":null,"subject":"RFC: script to manually associate files after failed rename detection in conflicting merge","fromName":"Tilman Vogel","fromEmail":"tilman.vogel@web.de","sentAt":"2011-03-30T13:38:37Z","receivedAt":"2011-03-30T13:38:37Z","isPatch":false,"sender":{"key":"tilman.vogel@web.de","avatar":"https://avatars.githubusercontent.com/u/349303?v=4"},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nHi!\n\nI am aware of the fact that recently, git gained the ability to control\nthe rename-threshold in merges. Still, it might sometimes be useful to\nhave manual control about what gets associated as a rename.\n\nThis is a first try to write a script that makes this task easy. I\ntested it here on CONFLICT (delete/modify) results and it seems to work\nquite well.\n\nI would be interested in feedback, in particular whether something\nsimilar is present already, even though I couldn't find anything other\nthan the instructions in the FAQ.\n\nI put the script on gist.github.com at\n\n<https://gist.github.com/894374>\n\nAnother, a little related question: Is anybody already working on making\n\"git checkout -m\" allow \"-X\" options? I'd really he happy about \"-X\nignore-space-change\" and its relatives.\n\nThanks for any feedback,\n\nTilman\n\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v2.0.15 (GNU/Linux)\nComment: Using GnuPG with SUSE - http://enigmail.mozdev.org/\n\niEYEARECAAYFAk2TMl0ACgkQ9ZPu6Yae8lkbiQCgkZ6KkzYqPER6sjKgd+JmZU4P\n9joAnjWflRjgqJ24RX+8AjcRU2uKBmGK\n=7GfJ\n-----END PGP SIGNATURE-----\n"}]}