title: git am from branch to master
body: <p>I'm working together with a college of mine in git.
  I'm working on a branch, and he's working on the master.
  I've done some work related to his files on my branch, and I decided to send him a patch file.
  I created the patch with <code>git format-patch</code>, and sent it to him.
  when he tries to apply the patch using <code>git am</code> he get's the following message: <code>previous release directory</code></p>
  
  <p>It's probably because the patch arrived from a different branch.</p>
  
  <p>Is there a way for him to use the patch on the master branch ?</p>
  
  <p>Note: I'm using <code>git am</code>, and not <code>git apply</code> to keep commit-id that is generated for jetty.
  I still want the commiter to be me on his local repository.</p>