git merge with renamed files

by

Since git 1.7.4, you can specify the rename threshold for merge as git merge -X rename-threshold=25 in order to control that a similarity of 25% is already enough to consider two files rename candidates. This, depending on the case together with -X ignore-space-change may make rename detection more reliable.

However, I wanted to have more direct control and was cooking up a related script the last days. Maybe it helps – let me know.

https://gist.github.com/894374

More Related Contents:

  1. What is HEAD in Git?
  2. Trying to fix line-endings with git filter-branch, but having no luck
  3. Break a previous commit into multiple commits
  4. git status shows modifications, git checkout — doesn’t remove them
  5. Git merge reports “Already up-to-date” though there is a difference
  6. How do I diff the same file between two different commits on the same branch?
  7. Cannot push to Heroku because key fingerprint
  8. How can I get Git to follow symlinks?
  9. Prevent commits in master branch
  10. How can I list all tags in my Git repository by the date they were created?
  11. How to exclude file only from root folder in Git
  12. Visual Studio Code cannot detect installed git
  13. How to update a git shallow clone?
  14. How to handle a large git repository?
  15. Git fast-forward VS no fast-forward merge
  16. Hg: How to do a rebase like git’s rebase
  17. Using Git how do I find changes between local and remote
  18. How can I view file history in Git?
  19. How to change git ssh user for a remote push temporarily?
  20. How to copy a Gitlab project to another Gitlab repository?
  21. gitolite push error -> remote: ENV GL_RC not set
  22. How to merge specific files from Git branches
  23. Error: Cannot pull with rebase: You have unstaged changes
  24. Git refuses to reset/discard files
  25. How does git track source code moved between files?
  26. How do I deal with corrupted Git object files?
  27. github: server certificate verification failed
  28. VS Code / Bitbucket / SSH – Permission denied (publickey)
  29. SourceTree App says uncommitted changes even for newly-cloned repository – what could be wrong?
  30. How do I write a batch file which opens the GitBash shell and runs a command in the shell?

Leave a Comment