title: Git show diff between one file on 2 branches to make them equal
body: <p>I have the same file on development_branch and on master branch. The correct version of the file is on development_branch and the version on master branch is very outdated.</p>
  
  <p>I know for sure that the version on development_branch is 100% accurate and I could simply replace the file on master branch to be 1:1 equal, but I want to keep the commit history, so is there any way I could get the commits from development_branch that are not on master branch to easily make it equal?</p>
  
  <p>There were some conflicts during merging and some of them might have been resolved incorrectly, in an incorrect order, there were many modifications etc. I want to get the exact file I have on the development_branch as an output.</p>
  
  <p>Any hints?</p>