Custom Git merge driver with no rename detection

Question

I would like to set up a Git repository with a custom merge driver, and then disable rename detection when merging.

The problem is that, if I use the default recursive strategy, I cannot disable rename detection, and if I use the resolve strategy (not ideal, but good enough), the merge driver is ignored.

Note that I would like to avoid rename detection even when the file contents perfectly match.

.git/config:

[merge "my"]
    name = my merge
    driver = my_merge_driver %A %O %B
[merge]
    default = my

Attempts:

$ git merge -X rename-threshold=200%  # Equivalent to 100%
$ git merge -s resolve                # Custom driver ignored
$ git --version                       # git version 2.2.0-rc0

Answer 1

As of Git 2.8.0.rc0, the merge-recursive algorithm now accepts an option "no-renames" (commit 4ce064d), so my problem is now solved by

$ git merge -X no-renames

Answer 2

Taking into account the use case you're planning for this, A good workaround would be to write the filename, along with the version number, in each file.