使用重命名的文件对Git进行重新设置

我有一个重命名许多文件的分支，并且我试图将其重新建立到修改原始文件的master上(最好不要将其分解为手动解决冲突的噩梦).

I've got a branch that renames many files, and I'm trying to rebase it onto master where the original files have been modified (preferably without this devolving into a manual conflict-resolution nightmare).

1. 我一直在本地typescript分支中将JavaScript项目移植到TypeScript.现在，所有.js文件都已成为.ts文件，并且某些语法已升级.

1. I've been porting a JavaScript project to TypeScript, in my local typescript branch. All of the .js files have now become .ts files, and some of the syntax has been upgraded.

与此同时，在master分支上发生了对原始.js文件的更改.

Meanwhile, changes to the original .js files have happened on the master branch.

我想将我的typescript分支变基到master上-但更改未正确合并，因为未检测到文件重命名-因此我们在git认为已删除的.js文件进行更改的情况下再次发生冲突(但是实际上已将它们重命名为.ts文件).

I want to rebase my typescript branch onto master -- but the changes are not merging correctly, as the file renames hadn't been detected -- so we're getting conflicts where changes are made to .js files which git thinks had been deleted (however they have actually been renamed to the .ts file).

我想我知道的东西

Git图形:

What I think I know

Git graph:

o-[typescript] .js files become .ts
|
| o-[master] changes to the .js files
| |
| o
|/
o-[root] common ancestor

所以，当站在root分支中时:

So, while standing in the root branch:

• 我可以运行以下命令来查看所有重命名:git diff --name-status --find-renames=10% typescript

我了解 git merge 命令与--find-renames功能，尽管我很难使它正常工作.

I understand that the git merge command has the same sort of --find-renames functionality, though I'm having difficulty getting that to work.

• 更新:git merge -X find-renames=10% mybranch似乎是预期的语法.

• Update: git merge -X find-renames=10% mybranch appears to be the expected syntax.

我了解 git rebase 可能支持find-renames功能，尽管我仍不清楚如何使用.

I understand the git rebase might support find-renames functionality, though I'm still not clear about how that might be used.

1. (否)也许从root起，我可以在检测到重命名的同时合并到typescript中(例如:git merge -X find-renames=10% typescript).然后，root就像typescript一样，只是带有重命名(而不是大量删除/添加).

1. (Nope) Perhaps from root, I could merge in typescript while detecting the renames (like this: git merge -X find-renames=10% typescript). Then, root will be just like typescript, except with renames (rather than mass deletions/additions).

• 我希望从那里开始git rebase master，并且有了重命名后，操作将顺利进行并将编辑内容放入正确的文件中.
  • 更新:我尝试过此操作，但随后的重新部署并没有比以前做得更好.
  • From there, I'm hoping I could just git rebase master, and with the renames having been in place, the operation will go smoothly and place the edits into the correct files.
    • Update: I tried this, but my subsequent rebase didn't go over any better than before.

    (是)我认为也许需要使用find-renames选项执行重新设置本身.我正在对此进行调查...

    (Yep) I think perhaps the rebase itself needs to be performed with the find-renames option.. I'm investigating this...

    • git rebase -X find-renames=10% master-否
    • git rebase -X --find-renames=10% master-不
    • git rebase --find-renames=10% master-否
    • git rebase -X recursive --find-renames=10% master-不
    • git rebase --merge -X find-renames=10% master-不
    • git rebase --strategy-option="rename-threshold=10" master-那就是票！可以！
    • git rebase -X find-renames=10% master -- nope
    • git rebase -X --find-renames=10% master -- nope
    • git rebase --find-renames=10% master -- nope
    • git rebase -X recursive --find-renames=10% master -- nope
    • git rebase --merge -X find-renames=10% master -- nope
    • git rebase --strategy-option="rename-threshold=10" master -- that's the ticket! it works!

    (不是)也许我需要以不同的方式看待这个问题?也许我应该从master开始，然后使用重命名检测对typescript进行某种壁球合并(而不是进行任何类型的变基?)

    (Nope) Perhaps I need to look at the problem differently? Maybe I should start from master, and then do some kind of squash merge of typescript with the rename detection (rather than any kind of rebase?)

    • 我不需要typescript分支的历史记录，无论如何它都会被压缩成一个胖提交供审核..
    • 更新::当我尝试此策略时，Git似乎停止工作.当我站在root分支时，我可以运行git merge -X find-renames=10 typescript －它快进了到typescript ..(不是我希望的那样，我希望有一个具有重命名而不是添加/删除的新提交.)
      • 当我站在master分支中，并且运行 完全相同的命令 时，git告诉我:fatal: Unknown option for merge-recursive: -Xfind-renames=10 ...
      • 现在，这困扰着我，因为我实际上没有输入它引用的内容(我确实包含了空格)，而且对我来说唯一不同的是我当前所在的分支-如果可以的话是未知"，那么为什么在其他分支中起作用?
      • 无论如何，这令人毛骨悚然，而且似乎使这种方法无路可走.
      • I don't need the typescript branch history, it will be squashed down to one fat commit for review anyways..
      • Update: It looks like Git stops working when I attempt this strategy.. When I'm standing in the root branch, I can run git merge -X find-renames=10 typescript -- and it fast-forwards to typescript.. (not quite what I was hoping for, I was hoping for a new commit that had renames rather than additions/deletions..)
        • When I'm standing in the master branch, and I run the exact same command, git tells me this: fatal: Unknown option for merge-recursive: -Xfind-renames=10...
        • Now, this bothers me, because I actually did not enter what it quoted (I did include the space), and the only thing that seems different to me, is which branch I'm currently standing in -- if the option is "Unknown", then why does it work when in a different branch?
        • Anyways, so that's creepy, and seems to make this approach a dead-end.