title: Git: Merge to master while automatically choosing to overwrite master files with branch
body: <p>I am using Git to track my documentation latex source. I want to keep the master branch full of documents that are suitable for end user release, so when someone needs something, i can just switch to the master branch, compile and hand out the document. </p>
  
  <p>I make new branches when a manual needs a major update. But, when the manual is approved, it needs to get merged back into the master. When merging from <em>branch</em> into <em>master</em>, I would like to pass some command to Git to say, "forget the merging, just use the the file from <em>branch</em> to overwrite the file in <em>master</em>." Is there a way to do this? Specifically, I want to avoid opening up a merge tool every time. Thanks in advance.</p>